2019-02-12 20:05:23

by Gustavo A. R. Silva

[permalink] [raw]
Subject: [PATCH] USB: musb: mark expected switch fall-through

In preparation to enabling -Wimplicit-fallthrough, mark switch
cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/usb/musb/musb_host.c: In function ‘musb_advance_schedule’:
drivers/usb/musb/musb_host.c:374:7: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (qh->mux == 1) {
^
drivers/usb/musb/musb_host.c:383:3: note: here
case USB_ENDPOINT_XFER_ISOC:
^~~~

Warning level 3 was used: -Wimplicit-fallthrough=3

Notice that, in this particular case, the code comment is modified
in accordance with what GCC is expecting to find.

This patch is part of the ongoing efforts to enable
-Wimplicit-fallthrough.

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/usb/musb/musb_host.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index b59ce9ad14ce..0566d5b6252e 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -378,7 +378,7 @@ static void musb_advance_schedule(struct musb *musb, struct urb *urb,
qh = first_qh(head);
break;
}
- /* else: fall through */
+ /* fall through */

case USB_ENDPOINT_XFER_ISOC:
case USB_ENDPOINT_XFER_INT:
--
2.20.1



2019-02-12 20:08:32

by Bin Liu

[permalink] [raw]
Subject: Re: [PATCH] USB: musb: mark expected switch fall-through

Hi Greg,

On Tue, Feb 12, 2019 at 01:23:57PM -0600, Gustavo A. R. Silva wrote:
> In preparation to enabling -Wimplicit-fallthrough, mark switch
> cases where we are expecting to fall through.
>
> This patch fixes the following warning:
>
> drivers/usb/musb/musb_host.c: In function ‘musb_advance_schedule’:
> drivers/usb/musb/musb_host.c:374:7: warning: this statement may fall through [-Wimplicit-fallthrough=]
> if (qh->mux == 1) {
> ^
> drivers/usb/musb/musb_host.c:383:3: note: here
> case USB_ENDPOINT_XFER_ISOC:
> ^~~~
>
> Warning level 3 was used: -Wimplicit-fallthrough=3
>
> Notice that, in this particular case, the code comment is modified
> in accordance with what GCC is expecting to find.
>
> This patch is part of the ongoing efforts to enable
> -Wimplicit-fallthrough.
>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

I've closed my musb tree for v5.1-rc1, if you want to directly pick this
patch, here is my Acked-by, or I will take it for v5.2-rc1.

Acked-by: Bin Liu <[email protected]>

> ---
> drivers/usb/musb/musb_host.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
> index b59ce9ad14ce..0566d5b6252e 100644
> --- a/drivers/usb/musb/musb_host.c
> +++ b/drivers/usb/musb/musb_host.c
> @@ -378,7 +378,7 @@ static void musb_advance_schedule(struct musb *musb, struct urb *urb,
> qh = first_qh(head);
> break;
> }
> - /* else: fall through */
> + /* fall through */
>
> case USB_ENDPOINT_XFER_ISOC:
> case USB_ENDPOINT_XFER_INT:
> --
> 2.20.1

Regards,
-Bin.

2019-02-13 13:29:30

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] USB: musb: mark expected switch fall-through

On Tue, Feb 12, 2019 at 01:47:54PM -0600, Bin Liu wrote:
> Hi Greg,
>
> On Tue, Feb 12, 2019 at 01:23:57PM -0600, Gustavo A. R. Silva wrote:
> > In preparation to enabling -Wimplicit-fallthrough, mark switch
> > cases where we are expecting to fall through.
> >
> > This patch fixes the following warning:
> >
> > drivers/usb/musb/musb_host.c: In function ‘musb_advance_schedule’:
> > drivers/usb/musb/musb_host.c:374:7: warning: this statement may fall through [-Wimplicit-fallthrough=]
> > if (qh->mux == 1) {
> > ^
> > drivers/usb/musb/musb_host.c:383:3: note: here
> > case USB_ENDPOINT_XFER_ISOC:
> > ^~~~
> >
> > Warning level 3 was used: -Wimplicit-fallthrough=3
> >
> > Notice that, in this particular case, the code comment is modified
> > in accordance with what GCC is expecting to find.
> >
> > This patch is part of the ongoing efforts to enable
> > -Wimplicit-fallthrough.
> >
> > Signed-off-by: Gustavo A. R. Silva <[email protected]>
>
> I've closed my musb tree for v5.1-rc1, if you want to directly pick this
> patch, here is my Acked-by, or I will take it for v5.2-rc1.
>
> Acked-by: Bin Liu <[email protected]>

I'll take it directly, thanks.

greg k-h

2019-02-13 23:27:47

by Gustavo A. R. Silva

[permalink] [raw]
Subject: Re: [PATCH] USB: musb: mark expected switch fall-through



On 2/13/19 3:08 AM, Greg Kroah-Hartman wrote:
> On Tue, Feb 12, 2019 at 01:47:54PM -0600, Bin Liu wrote:
>> Hi Greg,
>>
>> On Tue, Feb 12, 2019 at 01:23:57PM -0600, Gustavo A. R. Silva wrote:
>>> In preparation to enabling -Wimplicit-fallthrough, mark switch
>>> cases where we are expecting to fall through.
>>>
>>> This patch fixes the following warning:
>>>
>>> drivers/usb/musb/musb_host.c: In function ‘musb_advance_schedule’:
>>> drivers/usb/musb/musb_host.c:374:7: warning: this statement may fall through [-Wimplicit-fallthrough=]
>>> if (qh->mux == 1) {
>>> ^
>>> drivers/usb/musb/musb_host.c:383:3: note: here
>>> case USB_ENDPOINT_XFER_ISOC:
>>> ^~~~
>>>
>>> Warning level 3 was used: -Wimplicit-fallthrough=3
>>>
>>> Notice that, in this particular case, the code comment is modified
>>> in accordance with what GCC is expecting to find.
>>>
>>> This patch is part of the ongoing efforts to enable
>>> -Wimplicit-fallthrough.
>>>
>>> Signed-off-by: Gustavo A. R. Silva <[email protected]>
>>
>> I've closed my musb tree for v5.1-rc1, if you want to directly pick this
>> patch, here is my Acked-by, or I will take it for v5.2-rc1.
>>
>> Acked-by: Bin Liu <[email protected]>
>
> I'll take it directly, thanks.
>

Thank you both, Bin and Greg.

--
Gustavo