aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci.h
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2008-05-20 16:58:11 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-05-29 16:59:03 -0400
commita8e5177583e975fc1f7c621c93956f494df9b979 (patch)
tree8c7ca30de6668282d1883d5ed172dca6d947699c /drivers/usb/host/ehci.h
parent217a9081d8e69026186067711131b77f0ce219ed (diff)
USB: EHCI: fix up root-hub TT mess
This patch (as1095) cleans up the HCD glue and several of the EHCI bus-glue files. The ehci->is_tdi_rh_tt flag is redundant, since it means the same thing as the hcd->has_tt flag, so it is removed and the other flag used in its place. Some of the bus-glue files didn't get the relinquish_port method added to their hc_driver structures. Although that routine currently doesn't do anything for controllers with an integrated TT, in the future it might. So the patch adds it where it is missing. Lastly, some of the bus-glue files have erroneous entries for their hc_driver's suspend and resume methods. These method pointers are specific to PCI and shouldn't be used otherwise. (The patch also includes an invisible whitespace fix.) Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'drivers/usb/host/ehci.h')
-rw-r--r--drivers/usb/host/ehci.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index bf92d209a1a9..3cb482308343 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -112,7 +112,6 @@ struct ehci_hcd { /* one per controller */
112 u32 command; 112 u32 command;
113 113
114 /* SILICON QUIRKS */ 114 /* SILICON QUIRKS */
115 unsigned is_tdi_rh_tt:1; /* TDI roothub with TT */
116 unsigned no_selective_suspend:1; 115 unsigned no_selective_suspend:1;
117 unsigned has_fsl_port_bug:1; /* FreeScale */ 116 unsigned has_fsl_port_bug:1; /* FreeScale */
118 unsigned big_endian_mmio:1; 117 unsigned big_endian_mmio:1;
@@ -678,7 +677,7 @@ struct ehci_fstn {
678 * needed (mostly in root hub code). 677 * needed (mostly in root hub code).
679 */ 678 */
680 679
681#define ehci_is_TDI(e) ((e)->is_tdi_rh_tt) 680#define ehci_is_TDI(e) (ehci_to_hcd(e)->has_tt)
682 681
683/* Returns the speed of a device attached to a port on the root hub. */ 682/* Returns the speed of a device attached to a port on the root hub. */
684static inline unsigned int 683static inline unsigned int