Skip to contentSkip to conversation

usb: host: Move CONFIG_USB_MAX_CONTROLLER_COUNT to non-dm

PATCH New Jagan Teki 4 participants 5 messages Oct 15, 2016

Subsystems (3)
USB USB xHCI driver USB ehci driver
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/1 usb: host: Move CONFIG_USB_MAX_CONTROLLER_COUNT to non-dm

CONFIG_USB_MAX_CONTROLLER_COUNT not used in DM_USB, hence moved to non-dm from global area.

Cc Simon Glass <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Masahiro Yamada <[email protected]>
Signed-off-by Jagan Teki <[email protected]>
---
 drivers/usb/host/ehci-hcd.c | 8 ++++----
 drivers/usb/host/xhci.c     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/usb/host/ehci-hcd.c +4 -4
index 13aa70d..d8dc827 100644
@@ -21,10 +21,6 @@
 
 #include "ehci.h"
 
-#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
-#endif
-
 /*
  * EHCI spec page 20 says that the HC may take up to 16 uFrames (= 4ms) to halt.
  * Let's time out after 8 to have a little safety margin on top of that.

@@ -32,6 +28,10 @@
 #define HCHALT_TIMEOUT (8 * 1000)
 
 #ifndef CONFIG_DM_USB
+# ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
+#  define CONFIG_USB_MAX_CONTROLLER_COUNT 1
+# endif
+
 static struct ehci_ctrl ehcic[CONFIG_USB_MAX_CONTROLLER_COUNT];
 #endif
drivers/usb/host/xhci.c +4 -4
index 3201177..bb276da 100644
@@ -31,10 +31,6 @@
 #include <linux/errno.h>
 #include "xhci.h"
 
-#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
-#endif
-
 static struct descriptor {
 	struct usb_hub_descriptor hub;
 	struct usb_device_descriptor device;

@@ -110,6 +106,10 @@ static struct descriptor {
 };
 
 #ifndef CONFIG_DM_USB
+# ifndef CONFIG_USB_MAX_CONTROLLER_COUNT
+#  define CONFIG_USB_MAX_CONTROLLER_COUNT 1
+# endif
+
 static struct xhci_ctrl xhcic[CONFIG_USB_MAX_CONTROLLER_COUNT];
 #endif
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 usb: host: Move CONFIG_USB_MAX_CONTROLLER_COUNT to non-dm

Quoted 11 lines · Jagan Teki

CONFIG_USB_MAX_CONTROLLER_COUNT not used in DM_USB, hence moved to non-dm from global area.

Cc Simon Glass <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Masahiro Yamada <[email protected]>
Signed-off-by Jagan Teki <[email protected]>
---
 drivers/usb/host/ehci-hcd.c | 8 ++++----
 drivers/usb/host/xhci.c     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

It would be better to just move this to Kconfig, thanks.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161015/c0e96a0b/attachment.sig>
#2 lore raw

PATCH 1/1 usb: host: Move CONFIG_USB_MAX_CONTROLLER_COUNT to non-dm

Quoted 14 lines · Tom Rini
Quoted 11 lines · Jagan Teki

CONFIG_USB_MAX_CONTROLLER_COUNT not used in DM_USB, hence moved to non-dm from global area.

Cc Simon Glass <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Masahiro Yamada <[email protected]>
Signed-off-by Jagan Teki <[email protected]>
---
 drivers/usb/host/ehci-hcd.c | 8 ++++----
 drivers/usb/host/xhci.c     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
Quoted 2 lines

It would be better to just move this to Kconfig, thanks.

Yes, agreed.

Signature · 2 lines
Best regards,
Marek Vasut
#3 lore raw

PATCH 1/1 usb: host: Move CONFIG_USB_MAX_CONTROLLER_COUNT to non-dm

In reply to Tom Rini

2016-10-15 23:05 GMT+09:00 Tom Rini <[email protected]>:

Quoted 14 lines · Jagan Teki
Quoted 4 lines

CONFIG_USB_MAX_CONTROLLER_COUNT not used in DM_USB, hence moved to non-dm from global area.

Quoted 8 lines
Cc Simon Glass <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Masahiro Yamada <[email protected]>
Signed-off-by Jagan Teki <[email protected]>
---
 drivers/usb/host/ehci-hcd.c | 8 ++++----
 drivers/usb/host/xhci.c     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
Quoted 2 lines

It would be better to just move this to Kconfig, thanks.

This option will be removed sooner or later.

Do we need to move deprecated options to Kconfig?

Signature · 2 lines
Best Regards
Masahiro Yamada
#4 lore raw

PATCH 1/1 usb: host: Move CONFIG_USB_MAX_CONTROLLER_COUNT to non-dm

Quoted 15 lines · Masahiro Yamada

2016-10-15 23:05 GMT+09:00 Tom Rini <[email protected]>:

Quoted 14 lines · Jagan Teki
Quoted 12 lines

CONFIG_USB_MAX_CONTROLLER_COUNT not used in DM_USB, hence moved to non-dm from global area.

Cc Simon Glass <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Masahiro Yamada <[email protected]>
Signed-off-by Jagan Teki <[email protected]>
---
 drivers/usb/host/ehci-hcd.c | 8 ++++----
 drivers/usb/host/xhci.c     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
Quoted 5 lines
Quoted 1 line

It would be better to just move this to Kconfig, thanks.

This option will be removed sooner or later.

Do we need to move deprecated options to Kconfig?

If someone is touching it I'd rather see it moved. So we could just drop this patch.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20161015/aae309e0/attachment.sig>