[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

View File

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