Skip to contentSkip to conversation

Partially revert "usb: Kconfig: using select for USB_COMMON dependency"

PATCH In review Salvatore Bonaccorso 2 participants 3 messages Sep 21, 2021 – Oct 5, 2021 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Partially revert "usb: Kconfig: using select for USB_COMMON dependency"

From: Ben Hutchings <[email protected]>

This reverts commit cb9c1cfc86926d0e86d19c8e34f6c23458cd3478 for USB_LED_TRIG. This config symbol has bool type and enables extra code in usb_common itself, not a separate driver. Enabling it should not force usb_common to be built-in!

Fixes cb9c1cfc8692 ("usb: Kconfig: using select for USB_COMMON dependency")
---
 drivers/usb/common/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/common/Kconfig +1 -2
index 5e8a04e3dd3c..b856622431a7 100644
@@ -6,8 +6,7 @@ config USB_COMMON
 
 config USB_LED_TRIG
 	bool "USB LED Triggers"
-	depends on LEDS_CLASS && LEDS_TRIGGERS
-	select USB_COMMON
+	depends on LEDS_CLASS && USB_COMMON && LEDS_TRIGGERS
 	help
 	  This option adds LED triggers for USB host and/or gadget activity.
 
Signature · 1 line
2.33.0
#1 lore raw

Hi Greg,

Quoted 19 lines · Salvatore Bonaccorso

From: Ben Hutchings <[email protected]>

This reverts commit cb9c1cfc86926d0e86d19c8e34f6c23458cd3478 for USB_LED_TRIG. This config symbol has bool type and enables extra code in usb_common itself, not a separate driver. Enabling it should not force usb_common to be built-in!

Fixes cb9c1cfc8692 ("usb: Kconfig: using select for USB_COMMON dependency")
---
 drivers/usb/common/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/common/Kconfig +0 -0
index 5e8a04e3dd3c..b856622431a7 100644

drivers/usb/common/Kconfig config USB_COMMON · line 11

Quoted 8 lines
drivers/usb/common/Kconfig +1 -2
@@ -6,8 +6,7 @@ config USB_COMMON
 
 config USB_LED_TRIG
 	bool "USB LED Triggers"
-	depends on LEDS_CLASS && LEDS_TRIGGERS
-	select USB_COMMON
+	depends on LEDS_CLASS && USB_COMMON && LEDS_TRIGGERS
 	help
 	  This option adds LED triggers for USB host and/or gadget activity.

Sorry for bothering you again. Is this patch now ok, or do you need me to change something else? Or do I miss something?

Regards,
Salvatore

maintainer
#2 lore raw
Quoted 23 lines · Salvatore Bonaccorso

Hi Greg,

Quoted 20 lines · Salvatore Bonaccorso

From: Ben Hutchings <[email protected]>

This reverts commit cb9c1cfc86926d0e86d19c8e34f6c23458cd3478 for USB_LED_TRIG. This config symbol has bool type and enables extra code in usb_common itself, not a separate driver. Enabling it should not force usb_common to be built-in!

Fixes cb9c1cfc8692 ("usb: Kconfig: using select for USB_COMMON dependency")
---
 drivers/usb/common/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/common/Kconfig +0 -0
index 5e8a04e3dd3c..b856622431a7 100644
@@ -6,8 +6,7 @@ config USB_COMMON
 
Quoted 10 lines

drivers/usb/common/Kconfig config USB_COMMON · line 11

Quoted 7 lines
drivers/usb/common/Kconfig +1 -2
 config USB_LED_TRIG
 	bool "USB LED Triggers"
-	depends on LEDS_CLASS && LEDS_TRIGGERS
-	select USB_COMMON
+	depends on LEDS_CLASS && USB_COMMON && LEDS_TRIGGERS
 	help
 	  This option adds LED triggers for USB host and/or gadget activity.

Sorry for bothering you again. Is this patch now ok, or do you need me to change something else? Or do I miss something?

Nope, sorry for the delay, now applied.

greg k-h