2019-03-19 13:54:18

by Paul Cercueil

Subject: [PATCH] usb: musb: Silence error about blacklisting hubs if !CONFIG_USB

Some drivers, like jz4740-musb, don't depend on CONFIG_USB.

Signed-off-by: Paul Cercueil <[email protected]>
---
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 */
--
2.11.0

2019-04-01 15:45:27

by Bin Liu

Subject: Re: [PATCH] usb: musb: Silence error about blacklisting hubs if !CONFIG_USB

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 <[email protected]>
> ---
> 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.

2019-04-01 17:54:09

by Paul Cercueil

Subject: Re: [PATCH] usb: musb: Silence error about blacklisting hubs if !CONFIG_USB

Le lun. 1 avril 2019 ? 17:43, Bin Liu <[email protected]> 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 <[email protected]>
>> ---
>> 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.

2019-04-01 18:35:48

by Bin Liu

Subject: Re: [PATCH] usb: musb: Silence error about blacklisting hubs if !CONFIG_USB

On Mon, Apr 01, 2019 at 07:51:59PM +0200, Paul Cercueil wrote:
>
>
> Le lun. 1 avril 2019 ? 17:43, Bin Liu <[email protected]> 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 <[email protected]>
> >> ---
> >> 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.