watchdog: alim7101: Mark expected switch fall-through
diff mbox series

Message ID 20190320181658.GA6749@embeddedor
State Accepted
Headers show
Series
  • watchdog: alim7101: Mark expected switch fall-through
Related show

Commit Message

Gustavo A. R. Silva March 20, 2019, 6:16 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/watchdog/alim7101_wdt.c: In function ‘fop_ioctl’:
drivers/watchdog/alim7101_wdt.c:279:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
   wdt_keepalive();
   ^~~~~~~~~~~~~~~
drivers/watchdog/alim7101_wdt.c:282:2: note: here
  case WDIOC_GETTIMEOUT:
  ^~~~

Notice that, in this particular case, the /* Fall through */
comment is placed at the very bottom of the case statement,
which is what GCC is expecting to find.

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

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

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
 drivers/watchdog/alim7101_wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Guenter Roeck March 21, 2019, 12:12 a.m. UTC | #1
On 3/20/19 11:16 AM, 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/watchdog/alim7101_wdt.c: In function ‘fop_ioctl’:
> drivers/watchdog/alim7101_wdt.c:279:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
>     wdt_keepalive();
>     ^~~~~~~~~~~~~~~
> drivers/watchdog/alim7101_wdt.c:282:2: note: here
>    case WDIOC_GETTIMEOUT:
>    ^~~~
> 
> Notice that, in this particular case, the /* Fall through */
> comment is placed at the very bottom of the case statement,
> which is what GCC is expecting to find.
> 
> Warning level 3 was used: -Wimplicit-fallthrough=3
> 
> This patch is part of the ongoing efforts to enabling
> -Wimplicit-fallthrough.
> 
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>   drivers/watchdog/alim7101_wdt.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
> index 12f7ea62dddd..f5ada07e9202 100644
> --- a/drivers/watchdog/alim7101_wdt.c
> +++ b/drivers/watchdog/alim7101_wdt.c
> @@ -277,8 +277,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
>   			return -EINVAL;
>   		timeout = new_timeout;
>   		wdt_keepalive();
> -		/* Fall through */
>   	}
> +		/* Fall through */
>   	case WDIOC_GETTIMEOUT:
>   		return put_user(timeout, p);
>   	default:
>
Gustavo A. R. Silva March 21, 2019, 12:15 a.m. UTC | #2
On 3/20/19 7:12 PM, Guenter Roeck wrote:
> On 3/20/19 11:16 AM, 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/watchdog/alim7101_wdt.c: In function ‘fop_ioctl’:
>> drivers/watchdog/alim7101_wdt.c:279:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
>>     wdt_keepalive();
>>     ^~~~~~~~~~~~~~~
>> drivers/watchdog/alim7101_wdt.c:282:2: note: here
>>    case WDIOC_GETTIMEOUT:
>>    ^~~~
>>
>> Notice that, in this particular case, the /* Fall through */
>> comment is placed at the very bottom of the case statement,
>> which is what GCC is expecting to find.
>>
>> Warning level 3 was used: -Wimplicit-fallthrough=3
>>
>> This patch is part of the ongoing efforts to enabling
>> -Wimplicit-fallthrough.
>>
>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> 
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> 

Thanks, Guenter. :)

--
Gustavo

>> ---
>>   drivers/watchdog/alim7101_wdt.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
>> index 12f7ea62dddd..f5ada07e9202 100644
>> --- a/drivers/watchdog/alim7101_wdt.c
>> +++ b/drivers/watchdog/alim7101_wdt.c
>> @@ -277,8 +277,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
>>               return -EINVAL;
>>           timeout = new_timeout;
>>           wdt_keepalive();
>> -        /* Fall through */
>>       }
>> +        /* Fall through */
>>       case WDIOC_GETTIMEOUT:
>>           return put_user(timeout, p);
>>       default:
>>
>
Gustavo A. R. Silva April 5, 2019, 6:04 p.m. UTC | #3
Hi all,

Friendly ping:

Who can take this?

Thanks
--
Gustavo

On 3/20/19 7:15 PM, Gustavo A. R. Silva wrote:
> 
> 
> On 3/20/19 7:12 PM, Guenter Roeck wrote:
>> On 3/20/19 11:16 AM, 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/watchdog/alim7101_wdt.c: In function ‘fop_ioctl’:
>>> drivers/watchdog/alim7101_wdt.c:279:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
>>>     wdt_keepalive();
>>>     ^~~~~~~~~~~~~~~
>>> drivers/watchdog/alim7101_wdt.c:282:2: note: here
>>>    case WDIOC_GETTIMEOUT:
>>>    ^~~~
>>>
>>> Notice that, in this particular case, the /* Fall through */
>>> comment is placed at the very bottom of the case statement,
>>> which is what GCC is expecting to find.
>>>
>>> Warning level 3 was used: -Wimplicit-fallthrough=3
>>>
>>> This patch is part of the ongoing efforts to enabling
>>> -Wimplicit-fallthrough.
>>>
>>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
>>
>> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>>
> 
> Thanks, Guenter. :)
> 
> --
> Gustavo
> 
>>> ---
>>>   drivers/watchdog/alim7101_wdt.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
>>> index 12f7ea62dddd..f5ada07e9202 100644
>>> --- a/drivers/watchdog/alim7101_wdt.c
>>> +++ b/drivers/watchdog/alim7101_wdt.c
>>> @@ -277,8 +277,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
>>>               return -EINVAL;
>>>           timeout = new_timeout;
>>>           wdt_keepalive();
>>> -        /* Fall through */
>>>       }
>>> +        /* Fall through */
>>>       case WDIOC_GETTIMEOUT:
>>>           return put_user(timeout, p);
>>>       default:
>>>
>>
Guenter Roeck April 5, 2019, 8:55 p.m. UTC | #4
On Fri, Apr 05, 2019 at 01:04:27PM -0500, Gustavo A. R. Silva wrote:
> Hi all,
> 
> Friendly ping:
> 
> Who can take this?

I added it to my watchdog-next branch. Usually Wim will pick it up from there.

Guenter

> 
> Thanks
> --
> Gustavo
> 
> On 3/20/19 7:15 PM, Gustavo A. R. Silva wrote:
> > 
> > 
> > On 3/20/19 7:12 PM, Guenter Roeck wrote:
> >> On 3/20/19 11:16 AM, 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/watchdog/alim7101_wdt.c: In function ‘fop_ioctl’:
> >>> drivers/watchdog/alim7101_wdt.c:279:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
> >>>     wdt_keepalive();
> >>>     ^~~~~~~~~~~~~~~
> >>> drivers/watchdog/alim7101_wdt.c:282:2: note: here
> >>>    case WDIOC_GETTIMEOUT:
> >>>    ^~~~
> >>>
> >>> Notice that, in this particular case, the /* Fall through */
> >>> comment is placed at the very bottom of the case statement,
> >>> which is what GCC is expecting to find.
> >>>
> >>> Warning level 3 was used: -Wimplicit-fallthrough=3
> >>>
> >>> This patch is part of the ongoing efforts to enabling
> >>> -Wimplicit-fallthrough.
> >>>
> >>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> >>
> >> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> >>
> > 
> > Thanks, Guenter. :)
> > 
> > --
> > Gustavo
> > 
> >>> ---
> >>>   drivers/watchdog/alim7101_wdt.c | 2 +-
> >>>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
> >>> index 12f7ea62dddd..f5ada07e9202 100644
> >>> --- a/drivers/watchdog/alim7101_wdt.c
> >>> +++ b/drivers/watchdog/alim7101_wdt.c
> >>> @@ -277,8 +277,8 @@ static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> >>>               return -EINVAL;
> >>>           timeout = new_timeout;
> >>>           wdt_keepalive();
> >>> -        /* Fall through */
> >>>       }
> >>> +        /* Fall through */
> >>>       case WDIOC_GETTIMEOUT:
> >>>           return put_user(timeout, p);
> >>>       default:
> >>>
> >>
Gustavo A. R. Silva April 5, 2019, 9:41 p.m. UTC | #5
On 4/5/19 3:55 PM, Guenter Roeck wrote:
> On Fri, Apr 05, 2019 at 01:04:27PM -0500, Gustavo A. R. Silva wrote:
>> Hi all,
>>
>> Friendly ping:
>>
>> Who can take this?
> 
> I added it to my watchdog-next branch. Usually Wim will pick it up from there.
> 

Awesome. :)

Thanks, Guenter.
--
Gustavo

Patch
diff mbox series

diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
index 12f7ea62dddd..f5ada07e9202 100644
--- a/drivers/watchdog/alim7101_wdt.c
+++ b/drivers/watchdog/alim7101_wdt.c
@@ -277,8 +277,8 @@  static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 			return -EINVAL;
 		timeout = new_timeout;
 		wdt_keepalive();
-		/* Fall through */
 	}
+		/* Fall through */
 	case WDIOC_GETTIMEOUT:
 		return put_user(timeout, p);
 	default: