summaryrefslogtreecommitdiffstats
path: root/include/linux/usb/ch11.h
diff options
context:
space:
mode:
authorAlan Stern2010-03-04 17:32:30 +0100
committerGreg Kroah-Hartman2010-05-20 22:21:31 +0200
commit288ead45fa6637e959015d055304f521cbbc0575 (patch)
treeb150572e95760f26f905802269b3a76da0260976 /include/linux/usb/ch11.h
parentUSB: remove duplicated #include (diff)
downloadkernel-qcow2-linux-288ead45fa6637e959015d055304f521cbbc0575.tar.gz
kernel-qcow2-linux-288ead45fa6637e959015d055304f521cbbc0575.tar.xz
kernel-qcow2-linux-288ead45fa6637e959015d055304f521cbbc0575.zip
USB: remove bogus USB_PORT_FEAT_*_SPEED symbols
This patch (as1348) removes the bogus USB_PORT_FEAT_{HIGHSPEED,SUPERSPEED} symbols from ch11.h. No such features are defined by the USB spec. (There is a PORT_LOWSPEED feature, but the spec doesn't mention it except to say that host software should never use it.) The speed indicators are port statuses, not port features. As a temporary workaround for the xhci-hcd driver, a fictional USB_PORT_STAT_SUPER_SPEED symbol is added. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> CC: Sarah Sharp <sarah.a.sharp@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb/ch11.h')
-rw-r--r--include/linux/usb/ch11.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/usb/ch11.h b/include/linux/usb/ch11.h
index 35cb7357ff72..bd3185aba4ee 100644
--- a/include/linux/usb/ch11.h
+++ b/include/linux/usb/ch11.h
@@ -47,11 +47,7 @@
#define USB_PORT_FEAT_RESET 4
#define USB_PORT_FEAT_L1 5 /* L1 suspend */
#define USB_PORT_FEAT_POWER 8
-#define USB_PORT_FEAT_LOWSPEED 9
-/* This value was never in Table 11-17 */
-#define USB_PORT_FEAT_HIGHSPEED 10
-/* This value is also fake */
-#define USB_PORT_FEAT_SUPERSPEED 11
+#define USB_PORT_FEAT_LOWSPEED 9 /* Should never be used */
#define USB_PORT_FEAT_C_CONNECTION 16
#define USB_PORT_FEAT_C_ENABLE 17
#define USB_PORT_FEAT_C_SUSPEND 18
@@ -87,6 +83,7 @@ struct usb_port_status {
#define USB_PORT_STAT_TEST 0x0800
#define USB_PORT_STAT_INDICATOR 0x1000
/* bits 13 to 15 are reserved */
+#define USB_PORT_STAT_SUPER_SPEED 0x8000 /* Linux-internal */
/*
* wPortChange bit field