diff options
author | David Brownell <david-b@pacbell.net> | 2005-04-18 20:39:23 -0400 |
---|---|---|
committer | Greg K-H <gregkh@suse.de> | 2005-04-18 20:39:23 -0400 |
commit | 9a5d3e98dd31abcecbf4533b81866d440cc0f106 (patch) | |
tree | 8638550bd50ff0fdc3b097d0643b5efed3516633 /drivers/usb/host/ohci-pci.c | |
parent | 27d72e8572336d9f4e17a12ac924cb5223a5758d (diff) |
[PATCH] USB: hcd suspend uses pm_message_t
This patch includes minor "sparse -Wbitwise" updates for the PCI based
HCDs. Almost all of them involve just changing the second parameter of the
suspend() method to a pm_message_t ... the others relate to how the EHCI
code walks in-memory data structures. (There's a minor bug fixed there too
... affecting the big-endian sysfs async schedule dump.)
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Index: gregkh-2.6/drivers/usb/core/hcd.h
===================================================================
Diffstat (limited to 'drivers/usb/host/ohci-pci.c')
-rw-r--r-- | drivers/usb/host/ohci-pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index b611582e6bcf..f30118b5f9aa 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c | |||
@@ -102,7 +102,7 @@ ohci_pci_start (struct usb_hcd *hcd) | |||
102 | 102 | ||
103 | #ifdef CONFIG_PM | 103 | #ifdef CONFIG_PM |
104 | 104 | ||
105 | static int ohci_pci_suspend (struct usb_hcd *hcd, u32 state) | 105 | static int ohci_pci_suspend (struct usb_hcd *hcd, pm_message_t message) |
106 | { | 106 | { |
107 | struct ohci_hcd *ohci = hcd_to_ohci (hcd); | 107 | struct ohci_hcd *ohci = hcd_to_ohci (hcd); |
108 | 108 | ||
@@ -111,7 +111,7 @@ static int ohci_pci_suspend (struct usb_hcd *hcd, u32 state) | |||
111 | msleep (100); | 111 | msleep (100); |
112 | 112 | ||
113 | #ifdef CONFIG_USB_SUSPEND | 113 | #ifdef CONFIG_USB_SUSPEND |
114 | (void) usb_suspend_device (hcd->self.root_hub, state); | 114 | (void) usb_suspend_device (hcd->self.root_hub, message); |
115 | #else | 115 | #else |
116 | usb_lock_device (hcd->self.root_hub); | 116 | usb_lock_device (hcd->self.root_hub); |
117 | (void) ohci_hub_suspend (hcd); | 117 | (void) ohci_hub_suspend (hcd); |