diff options
author | David Brownell <david-b@pacbell.net> | 2005-09-13 22:59:11 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 19:47:39 -0400 |
commit | 8ad7fe16df5e07320626be83fbba6d1c6bda5ec0 (patch) | |
tree | 7bd854843d6d61756a16421368aa6cb1428b23c8 /drivers/usb/core | |
parent | dbc3887e7df4be78b33a83b97fde5d5f9a389859 (diff) |
[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(-)
Diffstat (limited to 'drivers/usb/core')
-rw-r--r-- | drivers/usb/core/hcd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 14c47a10da8..5e8ade07d7f 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
@@ -1431,6 +1431,8 @@ rescan: | |||
1431 | 1431 | ||
1432 | /*-------------------------------------------------------------------------*/ | 1432 | /*-------------------------------------------------------------------------*/ |
1433 | 1433 | ||
1434 | /* FIXME make this #ifdef CONFIG_PM ... update root hubs, retest */ | ||
1435 | |||
1434 | #ifdef CONFIG_USB_SUSPEND | 1436 | #ifdef CONFIG_USB_SUSPEND |
1435 | 1437 | ||
1436 | static int hcd_hub_suspend (struct usb_bus *bus) | 1438 | static int hcd_hub_suspend (struct usb_bus *bus) |