| Message ID | 20190319135146.25995-1-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 41386bc8cb2e0943cbeaa63e1fdb6b66a874ca90 |
| Headers | show |
| Series | usb: musb: Silence error about blacklisting hubs if !CONFIG_USB | expand |
On Tue, Mar 19, 2019 at 02:51:46PM +0100, Paul Cercueil wrote: > Some drivers, like jz4740-musb, don't depend on CONFIG_USB. CONFIG_USB_OTG_BLACKLIST_HUB is about hub, so should it depend on CONFIG_USB instead in drivers/usb/core/Kconfig? > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > drivers/usb/musb/musb_core.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c > index b7d56272f9d1..9f5a4819a744 100644 > --- a/drivers/usb/musb/musb_core.c > +++ b/drivers/usb/musb/musb_core.c > @@ -1497,10 +1497,11 @@ static int musb_core_init(u16 musb_type, struct musb *musb) > } else { > musb->is_multipoint = 0; > type = ""; > -#ifndef CONFIG_USB_OTG_BLACKLIST_HUB > - pr_err("%s: kernel must blacklist external hubs\n", > - musb_driver_name); > -#endif > + if (IS_ENABLED(CONFIG_USB) && > + !IS_ENABLED(CONFIG_USB_OTG_BLACKLIST_HUB)) { > + pr_err("%s: kernel must blacklist external hubs\n", > + musb_driver_name); > + } > } > > /* log release info */ Regards, -Bin.
Le lun. 1 avril 2019 à 17:43, Bin Liu <b-liu@ti.com> a écrit : > On Tue, Mar 19, 2019 at 02:51:46PM +0100, Paul Cercueil wrote: >> Some drivers, like jz4740-musb, don't depend on CONFIG_USB. > > CONFIG_USB_OTG_BLACKLIST_HUB is about hub, so should it depend on > CONFIG_USB instead in drivers/usb/core/Kconfig? It's already the case, indirectly - it depends on CONFIG_USB_OTG, which only exists if CONFIG_USB is set. >> >> Signed-off-by: Paul Cercueil <paul@crapouillou.net> >> --- >> drivers/usb/musb/musb_core.c | 9 +++++---- >> 1 file changed, 5 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/usb/musb/musb_core.c >> b/drivers/usb/musb/musb_core.c >> index b7d56272f9d1..9f5a4819a744 100644 >> --- a/drivers/usb/musb/musb_core.c >> +++ b/drivers/usb/musb/musb_core.c >> @@ -1497,10 +1497,11 @@ static int musb_core_init(u16 musb_type, >> struct musb *musb) >> } else { >> musb->is_multipoint = 0; >> type = ""; >> -#ifndef CONFIG_USB_OTG_BLACKLIST_HUB >> - pr_err("%s: kernel must blacklist external hubs\n", >> - musb_driver_name); >> -#endif >> + if (IS_ENABLED(CONFIG_USB) && >> + !IS_ENABLED(CONFIG_USB_OTG_BLACKLIST_HUB)) { >> + pr_err("%s: kernel must blacklist external hubs\n", >> + musb_driver_name); >> + } >> } >> >> /* log release info */ > > Regards, > -Bin.
On Mon, Apr 01, 2019 at 07:51:59PM +0200, Paul Cercueil wrote: > > > Le lun. 1 avril 2019 à 17:43, Bin Liu <b-liu@ti.com> a écrit : > >On Tue, Mar 19, 2019 at 02:51:46PM +0100, Paul Cercueil wrote: > >> Some drivers, like jz4740-musb, don't depend on CONFIG_USB. > > > >CONFIG_USB_OTG_BLACKLIST_HUB is about hub, so should it depend on > >CONFIG_USB instead in drivers/usb/core/Kconfig? > > It's already the case, indirectly - it depends on CONFIG_USB_OTG, > which only exists if CONFIG_USB is set. Never mind, my bad, I misunderstood the logic. > >> > >> Signed-off-by: Paul Cercueil <paul@crapouillou.net> > >> --- > >> drivers/usb/musb/musb_core.c | 9 +++++---- > >> 1 file changed, 5 insertions(+), 4 deletions(-) > >> > >> diff --git a/drivers/usb/musb/musb_core.c > >>b/drivers/usb/musb/musb_core.c > >> index b7d56272f9d1..9f5a4819a744 100644 > >> --- a/drivers/usb/musb/musb_core.c > >> +++ b/drivers/usb/musb/musb_core.c > >> @@ -1497,10 +1497,11 @@ static int musb_core_init(u16 > >>musb_type, struct musb *musb) > >> } else { > >> musb->is_multipoint = 0; > >> type = ""; > >> -#ifndef CONFIG_USB_OTG_BLACKLIST_HUB > >> - pr_err("%s: kernel must blacklist external hubs\n", > >> - musb_driver_name); > >> -#endif > >> + if (IS_ENABLED(CONFIG_USB) && > >> + !IS_ENABLED(CONFIG_USB_OTG_BLACKLIST_HUB)) { > >> + pr_err("%s: kernel must blacklist external hubs\n", > >> + musb_driver_name); > >> + } > >> } > >> > >> /* log release info */ The patch is applied. Thanks, -Bin.
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index b7d56272f9d1..9f5a4819a744 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1497,10 +1497,11 @@ static int musb_core_init(u16 musb_type, struct musb *musb) } else { musb->is_multipoint = 0; type = ""; -#ifndef CONFIG_USB_OTG_BLACKLIST_HUB - pr_err("%s: kernel must blacklist external hubs\n", - musb_driver_name); -#endif + if (IS_ENABLED(CONFIG_USB) && + !IS_ENABLED(CONFIG_USB_OTG_BLACKLIST_HUB)) { + pr_err("%s: kernel must blacklist external hubs\n", + musb_driver_name); + } } /* log release info */
Some drivers, like jz4740-musb, don't depend on CONFIG_USB. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- drivers/usb/musb/musb_core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)