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/ehci-hcd.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/ehci-hcd.c')
-rw-r--r-- | drivers/usb/host/ehci-hcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index a63bb792e2c7..84d2b93aca37 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
@@ -721,7 +721,7 @@ static int ehci_get_frame (struct usb_hcd *hcd) | |||
721 | * the right sort of wakeup. | 721 | * the right sort of wakeup. |
722 | */ | 722 | */ |
723 | 723 | ||
724 | static int ehci_suspend (struct usb_hcd *hcd, u32 state) | 724 | static int ehci_suspend (struct usb_hcd *hcd, pm_message_t message) |
725 | { | 725 | { |
726 | struct ehci_hcd *ehci = hcd_to_ehci (hcd); | 726 | struct ehci_hcd *ehci = hcd_to_ehci (hcd); |
727 | 727 | ||
@@ -729,7 +729,7 @@ static int ehci_suspend (struct usb_hcd *hcd, u32 state) | |||
729 | msleep (100); | 729 | msleep (100); |
730 | 730 | ||
731 | #ifdef CONFIG_USB_SUSPEND | 731 | #ifdef CONFIG_USB_SUSPEND |
732 | (void) usb_suspend_device (hcd->self.root_hub, state); | 732 | (void) usb_suspend_device (hcd->self.root_hub, message); |
733 | #else | 733 | #else |
734 | usb_lock_device (hcd->self.root_hub); | 734 | usb_lock_device (hcd->self.root_hub); |
735 | (void) ehci_hub_suspend (hcd); | 735 | (void) ehci_hub_suspend (hcd); |