aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2005-04-18 20:39:23 -0400
committerGreg K-H <gregkh@suse.de>2005-04-18 20:39:23 -0400
commit9a5d3e98dd31abcecbf4533b81866d440cc0f106 (patch)
tree8638550bd50ff0fdc3b097d0643b5efed3516633 /drivers/usb/host
parent27d72e8572336d9f4e17a12ac924cb5223a5758d (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')
-rw-r--r--drivers/usb/host/ehci-dbg.c2
-rw-r--r--drivers/usb/host/ehci-hcd.c4
-rw-r--r--drivers/usb/host/ehci-sched.c4
-rw-r--r--drivers/usb/host/ehci.h2
-rw-r--r--drivers/usb/host/ohci-pci.c4
-rw-r--r--drivers/usb/host/uhci-hcd.c2
6 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 495e2a3ef6f1..9b347d765383 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -394,7 +394,7 @@ static void qh_lines (
394 mark = ' '; 394 mark = ' ';
395 if (hw_curr == td->qtd_dma) 395 if (hw_curr == td->qtd_dma)
396 mark = '*'; 396 mark = '*';
397 else if (qh->hw_qtd_next == td->qtd_dma) 397 else if (qh->hw_qtd_next == cpu_to_le32(td->qtd_dma))
398 mark = '+'; 398 mark = '+';
399 else if (QTD_LENGTH (scratch)) { 399 else if (QTD_LENGTH (scratch)) {
400 if (td->hw_alt_next == ehci->async->hw_alt_next) 400 if (td->hw_alt_next == ehci->async->hw_alt_next)
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
724static int ehci_suspend (struct usb_hcd *hcd, u32 state) 724static 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);
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index f6c86354e304..2fa1ffee5ff3 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -310,9 +310,9 @@ static int qh_link_periodic (struct ehci_hcd *ehci, struct ehci_qh *qh)
310 310
311 for (i = qh->start; i < ehci->periodic_size; i += period) { 311 for (i = qh->start; i < ehci->periodic_size; i += period) {
312 union ehci_shadow *prev = &ehci->pshadow [i]; 312 union ehci_shadow *prev = &ehci->pshadow [i];
313 u32 *hw_p = &ehci->periodic [i]; 313 __le32 *hw_p = &ehci->periodic [i];
314 union ehci_shadow here = *prev; 314 union ehci_shadow here = *prev;
315 u32 type = 0; 315 __le32 type = 0;
316 316
317 /* skip the iso nodes at list head */ 317 /* skip the iso nodes at list head */
318 while (here.ptr) { 318 while (here.ptr) {
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 67988dba9eb7..e763a8399a75 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -364,7 +364,7 @@ union ehci_shadow {
364 struct ehci_itd *itd; /* Q_TYPE_ITD */ 364 struct ehci_itd *itd; /* Q_TYPE_ITD */
365 struct ehci_sitd *sitd; /* Q_TYPE_SITD */ 365 struct ehci_sitd *sitd; /* Q_TYPE_SITD */
366 struct ehci_fstn *fstn; /* Q_TYPE_FSTN */ 366 struct ehci_fstn *fstn; /* Q_TYPE_FSTN */
367 u32 *hw_next; /* (all types) */ 367 __le32 *hw_next; /* (all types) */
368 void *ptr; 368 void *ptr;
369}; 369};
370 370
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
105static int ohci_pci_suspend (struct usb_hcd *hcd, u32 state) 105static 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);
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 324a1a9bbdb2..98745a072d6f 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -716,7 +716,7 @@ static void uhci_stop(struct usb_hcd *hcd)
716} 716}
717 717
718#ifdef CONFIG_PM 718#ifdef CONFIG_PM
719static int uhci_suspend(struct usb_hcd *hcd, u32 state) 719static int uhci_suspend(struct usb_hcd *hcd, pm_message_t message)
720{ 720{
721 struct uhci_hcd *uhci = hcd_to_uhci(hcd); 721 struct uhci_hcd *uhci = hcd_to_uhci(hcd);
722 722