FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-22 09:22:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

USB: remove remaining instances of USB_SUSPEND

Browse Source 
Commit 84ebc10294 (USB: remove
CONFIG_USB_SUSPEND option) failed to remove all of the usages of
USB_SUSPEND throughout the kernel.  This patch (as1677) removes the
remaining instances of that symbol.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alan Stern 2013-05-01 12:13:54 -04:00 committed by Greg Kroah-Hartman
parent 815fa7b917
commit 98f541c6e3
13 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/configs/omap1_defconfig
View File

@ -199,7 +199,6 @@ CONFIG_USB_PHY=y
CONFIG_USB_DEBUG=y CONFIG_USB_DEBUG=y
CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not set # CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_SUSPEND=y
CONFIG_USB_MON=y CONFIG_USB_MON=y
CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

1
arch/arm/configs/omap2plus_defconfig
View File

@ -204,7 +204,6 @@ CONFIG_USB=y
CONFIG_USB_DEBUG=y CONFIG_USB_DEBUG=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICEFS=y
CONFIG_USB_SUSPEND=y
CONFIG_USB_MON=y CONFIG_USB_MON=y
CONFIG_USB_WDM=y CONFIG_USB_WDM=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

1
arch/mips/configs/db1000_defconfig
View File

@ -228,7 +228,6 @@ CONFIG_HIDRAW=y
CONFIG_USB_HID=y CONFIG_USB_HID=y
CONFIG_USB_SUPPORT=y CONFIG_USB_SUPPORT=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_SUSPEND=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_TT_NEWSCHED=y

1
arch/mips/configs/db1235_defconfig
View File

@ -344,7 +344,6 @@ CONFIG_UHID=y
CONFIG_USB_HIDDEV=y CONFIG_USB_HIDDEV=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_DYNAMIC_MINORS=y CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_SUSPEND=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_EHCI_HCD_PLATFORM=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_ROOT_HUB_TT=y

1
arch/mips/configs/lemote2f_defconfig
View File

@ -300,7 +300,6 @@ CONFIG_USB=y
CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not set # CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_DYNAMIC_MINORS=y CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_SUSPEND=y
CONFIG_USB_OTG_WHITELIST=y CONFIG_USB_OTG_WHITELIST=y
CONFIG_USB_MON=y CONFIG_USB_MON=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y

1
arch/powerpc/configs/ps3_defconfig
View File

@ -136,7 +136,6 @@ CONFIG_HID_SMARTJOYPLUS=m
CONFIG_USB_HIDDEV=y CONFIG_USB_HIDDEV=y
CONFIG_USB=m CONFIG_USB=m
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_SUSPEND=y
CONFIG_USB_MON=m CONFIG_USB_MON=m
CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_EHCI_HCD_PPC_OF is not set # CONFIG_USB_EHCI_HCD_PPC_OF is not set

2
drivers/net/usb/usbnet.c
View File

@ -1477,7 +1477,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
/* usbnet already took usb runtime pm, so have to enable the feature /* usbnet already took usb runtime pm, so have to enable the feature
* for usb interface, otherwise usb_autopm_get_interface may return * for usb interface, otherwise usb_autopm_get_interface may return
* failure if USB_SUSPEND(RUNTIME_PM) is enabled. * failure if RUNTIME_PM is enabled.
*/ */
if (!driver->supports_autosuspend) { if (!driver->supports_autosuspend) {
driver->supports_autosuspend = 1; driver->supports_autosuspend = 1;

2
drivers/staging/gdm72xx/Kconfig
View File

@ -39,7 +39,7 @@ if WIMAX_GDM72XX_USB
config WIMAX_GDM72XX_USB_PM config WIMAX_GDM72XX_USB_PM
bool "Enable power managerment support" bool "Enable power managerment support"
depends on USB_SUSPEND depends on PM_RUNTIME
endif # WIMAX_GDM72XX_USB endif # WIMAX_GDM72XX_USB

2
drivers/usb/core/Kconfig
View File

@ -51,7 +51,7 @@ config USB_DYNAMIC_MINORS
config USB_OTG config USB_OTG
bool "OTG support" bool "OTG support"
depends on USB_SUSPEND depends on PM_RUNTIME
default n default n
help help
The most notable feature of USB OTG is support for a The most notable feature of USB OTG is support for a

2
drivers/usb/host/isp1760-hcd.c
View File

@ -1739,7 +1739,7 @@ static int isp1760_hub_status_data(struct usb_hcd *hcd, char *buf)
int retval = 1; int retval = 1;
unsigned long flags; unsigned long flags;
/* if !USB_SUSPEND, root hub timers won't get shut down ... */ /* if !PM_RUNTIME, root hub timers won't get shut down ... */
if (!HC_IS_RUNNING(hcd->state)) if (!HC_IS_RUNNING(hcd->state))
return 0; return 0;

2
drivers/usb/host/oxu210hp-hcd.c
View File

@ -3084,7 +3084,7 @@ static int oxu_hub_status_data(struct usb_hcd *hcd, char *buf)
int ports, i, retval = 1; int ports, i, retval = 1;
unsigned long flags; unsigned long flags;
/* if !USB_SUSPEND, root hub timers won't get shut down ... */ /* if !PM_RUNTIME, root hub timers won't get shut down ... */
if (!HC_IS_RUNNING(hcd->state)) if (!HC_IS_RUNNING(hcd->state))
return 0; return 0;

2
drivers/usb/host/sl811-hcd.c
View File

@ -22,7 +22,7 @@
* and usb-storage. * and usb-storage.
* *
* TODO: * TODO:
* - usb suspend/resume triggered by sl811 (with USB_SUSPEND) * - usb suspend/resume triggered by sl811 (with PM_RUNTIME)
* - various issues noted in the code * - various issues noted in the code
* - performance work; use both register banks; ... * - performance work; use both register banks; ...
* - use urb->iso_frame_desc[] with ISO transfers * - use urb->iso_frame_desc[] with ISO transfers

4
drivers/usb/phy/Kconfig
View File

@ -25,7 +25,7 @@ config AB8500_USB
config FSL_USB2_OTG config FSL_USB2_OTG
bool "Freescale USB OTG Transceiver Driver" bool "Freescale USB OTG Transceiver Driver"
depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_SUSPEND depends on USB_EHCI_FSL && USB_FSL_USB2 && PM_RUNTIME
select USB_OTG select USB_OTG
help help
Enable this to support Freescale USB OTG transceiver. Enable this to support Freescale USB OTG transceiver.
@ -161,7 +161,7 @@ config USB_MSM_OTG
config USB_MV_OTG config USB_MV_OTG
tristate "Marvell USB OTG support" tristate "Marvell USB OTG support"
depends on USB_EHCI_MV && USB_MV_UDC && USB_SUSPEND depends on USB_EHCI_MV && USB_MV_UDC && PM_RUNTIME
select USB_OTG select USB_OTG
help help
Say Y here if you want to build Marvell USB OTG transciever Say Y here if you want to build Marvell USB OTG transciever