UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] remove some USB_SUSPEND dependencies 

This simplifies some of the PM-related #ifdeffing by recognizing
that USB_SUSPEND depends on PM.  Also, OHCI drivers were often
testing for USB_SUSPEND when they should have tested just PM.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

 drivers/usb/core/hcd.c          |    2 ++
 drivers/usb/host/ohci-hcd.c     |    2 +-
 drivers/usb/host/ohci-hub.c     |    4 ++--
 drivers/usb/host/ohci-omap.c    |    2 +-
 drivers/usb/host/ohci-pci.c     |    2 +-
 drivers/usb/host/ohci-ppc-soc.c |    4 ++--
 drivers/usb/host/ohci-pxa27x.c  |    2 +-
 drivers/usb/host/ohci-s3c2410.c |    3 +--
 drivers/usb/host/ohci-sa1111.c  |    2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)
This commit is contained in:
David Brownell 2005-09-13 19:59:11 -07:00 committed by Greg Kroah-Hartman
parent dbc3887e7d
commit 8ad7fe16df
9 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/core/hcd.c
View File

@ -1431,6 +1431,8 @@ rescan:
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* FIXME make this #ifdef CONFIG_PM ... update root hubs, retest */
#ifdef CONFIG_USB_SUSPEND #ifdef CONFIG_USB_SUSPEND
static int hcd_hub_suspend (struct usb_bus *bus) static int hcd_hub_suspend (struct usb_bus *bus)

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

@ -791,7 +791,7 @@ static void ohci_stop (struct usb_hcd *hcd)
/* must not be called from interrupt context */ /* must not be called from interrupt context */
#if defined(CONFIG_USB_SUSPEND) || defined(CONFIG_PM) #ifdef CONFIG_PM
static int ohci_restart (struct ohci_hcd *ohci) static int ohci_restart (struct ohci_hcd *ohci)
{ {

4
drivers/usb/host/ohci-hub.c
View File

@ -36,7 +36,7 @@
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#if defined(CONFIG_USB_SUSPEND) || defined(CONFIG_PM) #ifdef CONFIG_PM
#define OHCI_SCHED_ENABLES \ #define OHCI_SCHED_ENABLES \
(OHCI_CTRL_CLE|OHCI_CTRL_BLE|OHCI_CTRL_PLE|OHCI_CTRL_IE) (OHCI_CTRL_CLE|OHCI_CTRL_BLE|OHCI_CTRL_PLE|OHCI_CTRL_IE)
@ -294,7 +294,7 @@ static void ohci_rh_resume (void *_hcd)
ohci_dbg(ohci, "rh_resume ??\n"); ohci_dbg(ohci, "rh_resume ??\n");
} }
#endif /* CONFIG_USB_SUSPEND || CONFIG_PM */ #endif /* CONFIG_PM */
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/

2
drivers/usb/host/ohci-omap.c
View File

@ -420,7 +420,7 @@ static const struct hc_driver ohci_omap_hc_driver = {
*/ */
.hub_status_data = ohci_hub_status_data, .hub_status_data = ohci_hub_status_data,
.hub_control = ohci_hub_control, .hub_control = ohci_hub_control,
#ifdef CONFIG_USB_SUSPEND #ifdef CONFIG_PM
.hub_suspend = ohci_hub_suspend, .hub_suspend = ohci_hub_suspend,
.hub_resume = ohci_hub_resume, .hub_resume = ohci_hub_resume,
#endif #endif

2
drivers/usb/host/ohci-pci.c
View File

@ -218,7 +218,7 @@ static const struct hc_driver ohci_pci_hc_driver = {
*/ */
.hub_status_data = ohci_hub_status_data, .hub_status_data = ohci_hub_status_data,
.hub_control = ohci_hub_control, .hub_control = ohci_hub_control,
#ifdef CONFIG_USB_SUSPEND #ifdef CONFIG_PM
.hub_suspend = ohci_hub_suspend, .hub_suspend = ohci_hub_suspend,
.hub_resume = ohci_hub_resume, .hub_resume = ohci_hub_resume,
#endif #endif

4
drivers/usb/host/ohci-ppc-soc.c
View File

@ -163,7 +163,7 @@ static const struct hc_driver ohci_ppc_soc_hc_driver = {
*/ */
.hub_status_data = ohci_hub_status_data, .hub_status_data = ohci_hub_status_data,
.hub_control = ohci_hub_control, .hub_control = ohci_hub_control,
#ifdef CONFIG_USB_SUSPEND #ifdef CONFIG_PM
.hub_suspend = ohci_hub_suspend, .hub_suspend = ohci_hub_suspend,
.hub_resume = ohci_hub_resume, .hub_resume = ohci_hub_resume,
#endif #endif
@ -196,7 +196,7 @@ static struct device_driver ohci_hcd_ppc_soc_driver = {
.bus = &platform_bus_type, .bus = &platform_bus_type,
.probe = ohci_hcd_ppc_soc_drv_probe, .probe = ohci_hcd_ppc_soc_drv_probe,
.remove = ohci_hcd_ppc_soc_drv_remove, .remove = ohci_hcd_ppc_soc_drv_remove,
#if defined(CONFIG_USB_SUSPEND) || defined(CONFIG_PM) #ifdef CONFIG_PM
/*.suspend = ohci_hcd_ppc_soc_drv_suspend,*/ /*.suspend = ohci_hcd_ppc_soc_drv_suspend,*/
/*.resume = ohci_hcd_ppc_soc_drv_resume,*/ /*.resume = ohci_hcd_ppc_soc_drv_resume,*/
#endif #endif

2
drivers/usb/host/ohci-pxa27x.c
View File

@ -278,7 +278,7 @@ static const struct hc_driver ohci_pxa27x_hc_driver = {
*/ */
.hub_status_data = ohci_hub_status_data, .hub_status_data = ohci_hub_status_data,
.hub_control = ohci_hub_control, .hub_control = ohci_hub_control,
#ifdef CONFIG_USB_SUSPEND #ifdef CONFIG_PM
.hub_suspend = ohci_hub_suspend, .hub_suspend = ohci_hub_suspend,
.hub_resume = ohci_hub_resume, .hub_resume = ohci_hub_resume,
#endif #endif

3
drivers/usb/host/ohci-s3c2410.c
View File

@ -448,8 +448,7 @@ static const struct hc_driver ohci_s3c2410_hc_driver = {
*/ */
.hub_status_data = ohci_s3c2410_hub_status_data, .hub_status_data = ohci_s3c2410_hub_status_data,
.hub_control = ohci_s3c2410_hub_control, .hub_control = ohci_s3c2410_hub_control,
#ifdef CONFIG_PM
#if defined(CONFIG_USB_SUSPEND) && 0
.hub_suspend = ohci_hub_suspend, .hub_suspend = ohci_hub_suspend,
.hub_resume = ohci_hub_resume, .hub_resume = ohci_hub_resume,
#endif #endif

2
drivers/usb/host/ohci-sa1111.c
View File

@ -235,7 +235,7 @@ static const struct hc_driver ohci_sa1111_hc_driver = {
*/ */
.hub_status_data = ohci_hub_status_data, .hub_status_data = ohci_hub_status_data,
.hub_control = ohci_hub_control, .hub_control = ohci_hub_control,
#ifdef CONFIG_USB_SUSPEND #ifdef CONFIG_PM
.hub_suspend = ohci_hub_suspend, .hub_suspend = ohci_hub_suspend,
.hub_resume = ohci_hub_resume, .hub_resume = ohci_hub_resume,
#endif #endif