mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-27 14:28:05 +00:00
Koen Kooi
ebbeb55561
Also add script used to generate patches and SRC_URI Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
75 lines
2.9 KiB
Diff
75 lines
2.9 KiB
Diff
From 4c64933ec58a84dbda536345d8ff36cdd503cebe Mon Sep 17 00:00:00 2001
|
|
From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
|
|
Date: Thu, 5 Jan 2012 16:28:54 -0800
|
|
Subject: [PATCH 38/72] USB: Remove duplicate USB 3.0 hub feature #defines.
|
|
|
|
commit d9f5343e35d9138432657202afa8e3ddb2ade360 upstream.
|
|
|
|
Somehow we ended up with duplicate hub feature #defines in ch11.h.
|
|
Tatyana Brokhman first created the USB 3.0 hub feature macros in 2.6.38
|
|
with commit 0eadcc09203349b11ca477ec367079b23d32ab91 "usb: USB3.0 ch11
|
|
definitions". In 2.6.39, I modified a patch from John Youn that added
|
|
similar macros in a different place in the same file, and committed
|
|
dbe79bbe9dcb22cb3651c46f18943477141ca452 "USB 3.0 Hub Changes".
|
|
|
|
Some of the #defines used different names for the same values. Others
|
|
used exactly the same names with the same values, like these gems:
|
|
|
|
#define USB_PORT_FEAT_BH_PORT_RESET 28
|
|
...
|
|
#define USB_PORT_FEAT_BH_PORT_RESET 28
|
|
|
|
According to my very geeky husband (who looked it up in the C99 spec),
|
|
it is allowed to have object-like macros with duplicate names as long as
|
|
the replacement list is exactly the same. However, he recalled that
|
|
some compilers will give warnings when they find duplicate macros. It's
|
|
probably best to remove the duplicates in the stable tree, so that the
|
|
code compiles for everyone.
|
|
|
|
The macros are now fixed to move the feature requests that are specific
|
|
to USB 3.0 hubs into a new section (out of the USB 2.0 hub feature
|
|
section), and use the most common macro name.
|
|
|
|
This patch should be backported to 2.6.39.
|
|
|
|
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
|
|
Cc: Tatyana Brokhman <tlinder@codeaurora.org>
|
|
Cc: John Youn <johnyoun@synopsys.com>
|
|
Cc: Jamey Sharp <jamey@minilop.net>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
include/linux/usb/ch11.h | 10 ++--------
|
|
1 file changed, 2 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/include/linux/usb/ch11.h b/include/linux/usb/ch11.h
|
|
index 4ebaf08..1eb735b 100644
|
|
--- a/include/linux/usb/ch11.h
|
|
+++ b/include/linux/usb/ch11.h
|
|
@@ -62,12 +62,6 @@
|
|
#define USB_PORT_FEAT_TEST 21
|
|
#define USB_PORT_FEAT_INDICATOR 22
|
|
#define USB_PORT_FEAT_C_PORT_L1 23
|
|
-#define USB_PORT_FEAT_C_PORT_LINK_STATE 25
|
|
-#define USB_PORT_FEAT_C_PORT_CONFIG_ERROR 26
|
|
-#define USB_PORT_FEAT_PORT_REMOTE_WAKE_MASK 27
|
|
-#define USB_PORT_FEAT_BH_PORT_RESET 28
|
|
-#define USB_PORT_FEAT_C_BH_PORT_RESET 29
|
|
-#define USB_PORT_FEAT_FORCE_LINKPM_ACCEPT 30
|
|
|
|
/*
|
|
* Port feature selectors added by USB 3.0 spec.
|
|
@@ -76,8 +70,8 @@
|
|
#define USB_PORT_FEAT_LINK_STATE 5
|
|
#define USB_PORT_FEAT_U1_TIMEOUT 23
|
|
#define USB_PORT_FEAT_U2_TIMEOUT 24
|
|
-#define USB_PORT_FEAT_C_LINK_STATE 25
|
|
-#define USB_PORT_FEAT_C_CONFIG_ERR 26
|
|
+#define USB_PORT_FEAT_C_PORT_LINK_STATE 25
|
|
+#define USB_PORT_FEAT_C_PORT_CONFIG_ERROR 26
|
|
#define USB_PORT_FEAT_REMOTE_WAKE_MASK 27
|
|
#define USB_PORT_FEAT_BH_PORT_RESET 28
|
|
#define USB_PORT_FEAT_C_BH_PORT_RESET 29
|
|
--
|
|
1.7.9.4
|
|
|