Re: [PATCH] Partially revert "usb: Kconfig: using select for USB_COMMON dependency"

[Salvatore Bonaccorso <carnil@debian.org>]

Hi Greg,

On Sat, Sep 18, 2021 at 02:41:45PM +0200, Greg Kroah-Hartman wrote:
> On Sat, Sep 18, 2021 at 02:32:40PM +0200, Salvatore Bonaccorso wrote:
> > Hi Greg,
> > 
> > This is a reply to a very old patch submission:
> > 
> > On Tue, Apr 18, 2017 at 02:36:39AM +0000, Ben Hutchings wrote:
> > > 
> > > 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")
> > > Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> > > ---
> > >  drivers/usb/Kconfig | 3 +--
> > >  1 file changed, 1 insertion(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
> > > index fbe493d44e81..8270abe6c677 100644
> > > --- a/drivers/usb/Kconfig
> > > +++ b/drivers/usb/Kconfig
> > > @@ -154,8 +154,7 @@ source "drivers/usb/gadget/Kconfig"
> > > =20
> > >  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.
> > 
> > Was going through the series of patches we had applied in Debian and
> > noticed while this was submitted by Ben back in 2017, it looks it was
> > never applied or considered. Would that be something you could pick
> > up? I'm inlining the original patch from Ben.
> > 
> > Regards,
> > Salvatore
> > 
> > From: Ben Hutchings <ben@decadent.org.uk>
> > Date: Wed, 11 Jan 2017 04:30:40 +0000
> > Subject: Partially revert "usb: Kconfig: using select for USB_COMMON  dependency"
> > 
> > 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")
> > Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> > ---
> >  drivers/usb/common/Kconfig | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/drivers/usb/common/Kconfig b/drivers/usb/common/Kconfig
> > index d611477aae41..196f4a397587 100644
> > --- a/drivers/usb/common/Kconfig
> > +++ b/drivers/usb/common/Kconfig
> > @@ -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.
> >  
> 
> I would need it submitted in a format that I can apply it in, and your
> signed-off-by: added as well as it is coming through you.

Thanks for confirming! Find it attached/inline in a git am applicable
form and the Signed-off-by added.

Regards,
Salvatore

From de72d7df728722515b9700ff673a88ca6f8d9ace Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 11 Jan 2017 04:30:40 +0000
Subject: [PATCH] Partially revert "usb: Kconfig: using select for USB_COMMON
 dependency"

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")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
---
 drivers/usb/common/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/usb/common/Kconfig b/drivers/usb/common/Kconfig
index 5e8a04e3dd3c..b856622431a7 100644
--- a/drivers/usb/common/Kconfig
+++ b/drivers/usb/common/Kconfig
@@ -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.
 
-- 
2.33.0