diff mbox series

usb: isp1760-hcd: Fix fall-through annotations

Message ID 20190501153934.GA20025@embeddedor (mailing list archive)
State Mainlined
Commit ce64cea47cc4a16a8e55150a255254c0402ba3f5
Headers show
Series usb: isp1760-hcd: Fix fall-through annotations | expand

Commit Message

Gustavo A. R. Silva May 1, 2019, 3:39 p.m. UTC
In preparation to enabling -Wimplicit-fallthrough, mark switch
cases where we are expecting to fall through.

This patch fixes the following warning:

drivers/usb/isp1760/isp1760-hcd.c: In function ‘collect_qtds’:
drivers/usb/isp1760/isp1760-hcd.c:788:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
      mem_reads8(hcd->regs, qtd->payload_addr,
      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
        qtd->data_buffer,
        ~~~~~~~~~~~~~~~~~
        qtd->actual_length);
        ~~~~~~~~~~~~~~~~~~~
drivers/usb/isp1760/isp1760-hcd.c:792:5: note: here
     case OUT_PID:
     ^~~~

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

Notice that, in this particular case, the code comments are 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 <gustavo@embeddedor.com>
---
Notice that this code has been out there since 2011, and who
introduced the question mark was the original developer.

It'd be good if someone can confirm that the fall-through
has been intentional all this time.
	
Thanks
--
Gustavo

 drivers/usb/isp1760/isp1760-hcd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Greg KH May 1, 2019, 4:03 p.m. UTC | #1
On Wed, May 01, 2019 at 10:39:34AM -0500, 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/isp1760/isp1760-hcd.c: In function ‘collect_qtds’:
> drivers/usb/isp1760/isp1760-hcd.c:788:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
>       mem_reads8(hcd->regs, qtd->payload_addr,
>       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>         qtd->data_buffer,
>         ~~~~~~~~~~~~~~~~~
>         qtd->actual_length);
>         ~~~~~~~~~~~~~~~~~~~
> drivers/usb/isp1760/isp1760-hcd.c:792:5: note: here
>      case OUT_PID:
>      ^~~~
> 
> Warning level 3 was used: -Wimplicit-fallthrough=3
> 
> Notice that, in this particular case, the code comments are 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 <gustavo@embeddedor.com>
> ---
> Notice that this code has been out there since 2011, and who
> introduced the question mark was the original developer.
> 
> It'd be good if someone can confirm that the fall-through
> has been intentional all this time.

Yes, it looks intentional.  Messy, and as no one has complained since
2011, let's leave it alone, I'll queue this up.

thanks,

greg k-h
Gustavo A. R. Silva May 1, 2019, 4:13 p.m. UTC | #2
On 5/1/19 11:03 AM, Greg Kroah-Hartman wrote:
> On Wed, May 01, 2019 at 10:39:34AM -0500, 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/isp1760/isp1760-hcd.c: In function ‘collect_qtds’:
>> drivers/usb/isp1760/isp1760-hcd.c:788:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
>>       mem_reads8(hcd->regs, qtd->payload_addr,
>>       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>         qtd->data_buffer,
>>         ~~~~~~~~~~~~~~~~~
>>         qtd->actual_length);
>>         ~~~~~~~~~~~~~~~~~~~
>> drivers/usb/isp1760/isp1760-hcd.c:792:5: note: here
>>      case OUT_PID:
>>      ^~~~
>>
>> Warning level 3 was used: -Wimplicit-fallthrough=3
>>
>> Notice that, in this particular case, the code comments are 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 <gustavo@embeddedor.com>
>> ---
>> Notice that this code has been out there since 2011, and who
>> introduced the question mark was the original developer.
>>
>> It'd be good if someone can confirm that the fall-through
>> has been intentional all this time.
> 
> Yes, it looks intentional.  Messy, and as no one has complained since
> 2011, let's leave it alone, I'll queue this up.
> 

Great.

Thanks, Greg.
--
Gustavo
diff mbox series

Patch

diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c
index 8142c6b4c4cf..320fc4739835 100644
--- a/drivers/usb/isp1760/isp1760-hcd.c
+++ b/drivers/usb/isp1760/isp1760-hcd.c
@@ -788,11 +788,11 @@  static void collect_qtds(struct usb_hcd *hcd, struct isp1760_qh *qh,
 					mem_reads8(hcd->regs, qtd->payload_addr,
 							qtd->data_buffer,
 							qtd->actual_length);
-					/* Fall through (?) */
+					/* Fall through */
 				case OUT_PID:
 					qtd->urb->actual_length +=
 							qtd->actual_length;
-					/* Fall through ... */
+					/* Fall through */
 				case SETUP_PID:
 					break;
 				}