mtd: phram: Mark expected switch fall-throughs

Message ID 20190208180911.GA32525@embeddedor
State New
Headers show
Series
  • mtd: phram: Mark expected switch fall-throughs
Related show

Commit Message

Gustavo A. R. Silva Feb. 8, 2019, 6:09 p.m.
In preparation to enabling -Wimplicit-fallthrough, mark switch
cases where we are expecting to fall through.

This patch fixes the following warnings:

drivers/mtd/devices/phram.c: In function ‘parse_num64’:
drivers/mtd/devices/phram.c:149:11: warning: this statement may fall through [-Wimplicit-fallthrough=]
     shift += 10;
     ~~~~~~^~~~~
drivers/mtd/devices/phram.c:150:4: note: here
    case 'M':
    ^~~~
drivers/mtd/devices/phram.c:151:11: warning: this statement may fall through [-Wimplicit-fallthrough=]
     shift += 10;
     ~~~~~~^~~~~
drivers/mtd/devices/phram.c:152:4: note: here
    case 'k':
    ^~~~

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/mtd/devices/phram.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Gustavo A. R. Silva March 20, 2019, 8:19 p.m. | #1
Hi all,

Friendly ping:

Who can take this?

Thanks
--
Gustavo

On 2/8/19 12:09 PM, 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 warnings:
> 
> drivers/mtd/devices/phram.c: In function ‘parse_num64’:
> drivers/mtd/devices/phram.c:149:11: warning: this statement may fall through [-Wimplicit-fallthrough=]
>      shift += 10;
>      ~~~~~~^~~~~
> drivers/mtd/devices/phram.c:150:4: note: here
>     case 'M':
>     ^~~~
> drivers/mtd/devices/phram.c:151:11: warning: this statement may fall through [-Wimplicit-fallthrough=]
>      shift += 10;
>      ~~~~~~^~~~~
> drivers/mtd/devices/phram.c:152:4: note: here
>     case 'k':
>     ^~~~
> 
> 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/mtd/devices/phram.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
> index 9ee04b5f9311..8a8627c30aed 100644
> --- a/drivers/mtd/devices/phram.c
> +++ b/drivers/mtd/devices/phram.c
> @@ -147,8 +147,10 @@ static int parse_num64(uint64_t *num64, char *token)
>  			switch (token[len - 2]) {
>  			case 'G':
>  				shift += 10;
> +				/* fall through */
>  			case 'M':
>  				shift += 10;
> +				/* fall through */
>  			case 'k':
>  				shift += 10;
>  				token[len - 2] = 0;
>
Gustavo A. R. Silva April 10, 2019, 9:16 p.m. | #2
Hi all,

If no one cares I'll add this to my tree for 5.2.

Thanks
--
Gustavo

On 3/20/19 3:19 PM, Gustavo A. R. Silva wrote:
> Hi all,
> 
> Friendly ping:
> 
> Who can take this?
> 
> Thanks
> --
> Gustavo
> 
> On 2/8/19 12:09 PM, 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 warnings:
>>
>> drivers/mtd/devices/phram.c: In function ‘parse_num64’:
>> drivers/mtd/devices/phram.c:149:11: warning: this statement may fall through [-Wimplicit-fallthrough=]
>>      shift += 10;
>>      ~~~~~~^~~~~
>> drivers/mtd/devices/phram.c:150:4: note: here
>>     case 'M':
>>     ^~~~
>> drivers/mtd/devices/phram.c:151:11: warning: this statement may fall through [-Wimplicit-fallthrough=]
>>      shift += 10;
>>      ~~~~~~^~~~~
>> drivers/mtd/devices/phram.c:152:4: note: here
>>     case 'k':
>>     ^~~~
>>
>> 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/mtd/devices/phram.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
>> index 9ee04b5f9311..8a8627c30aed 100644
>> --- a/drivers/mtd/devices/phram.c
>> +++ b/drivers/mtd/devices/phram.c
>> @@ -147,8 +147,10 @@ static int parse_num64(uint64_t *num64, char *token)
>>  			switch (token[len - 2]) {
>>  			case 'G':
>>  				shift += 10;
>> +				/* fall through */
>>  			case 'M':
>>  				shift += 10;
>> +				/* fall through */
>>  			case 'k':
>>  				shift += 10;
>>  				token[len - 2] = 0;
>>
Kees Cook April 10, 2019, 9:46 p.m. | #3
On Fri, Feb 8, 2019 at 10:17 AM Gustavo A. R. Silva
<gustavo@embeddedor.com> wrote:
>
> In preparation to enabling -Wimplicit-fallthrough, mark switch
> cases where we are expecting to fall through.
>
> This patch fixes the following warnings:
>
> drivers/mtd/devices/phram.c: In function ‘parse_num64’:
> drivers/mtd/devices/phram.c:149:11: warning: this statement may fall through [-Wimplicit-fallthrough=]
>      shift += 10;
>      ~~~~~~^~~~~
> drivers/mtd/devices/phram.c:150:4: note: here
>     case 'M':
>     ^~~~
> drivers/mtd/devices/phram.c:151:11: warning: this statement may fall through [-Wimplicit-fallthrough=]
>      shift += 10;
>      ~~~~~~^~~~~
> drivers/mtd/devices/phram.c:152:4: note: here
>     case 'k':
>     ^~~~
>
> 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: Kees Cook <keescook@chromium.org>

-Kees

> ---
>  drivers/mtd/devices/phram.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
> index 9ee04b5f9311..8a8627c30aed 100644
> --- a/drivers/mtd/devices/phram.c
> +++ b/drivers/mtd/devices/phram.c
> @@ -147,8 +147,10 @@ static int parse_num64(uint64_t *num64, char *token)
>                         switch (token[len - 2]) {
>                         case 'G':
>                                 shift += 10;
> +                               /* fall through */
>                         case 'M':
>                                 shift += 10;
> +                               /* fall through */
>                         case 'k':
>                                 shift += 10;
>                                 token[len - 2] = 0;
> --
> 2.20.1
>

Patch

diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index 9ee04b5f9311..8a8627c30aed 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -147,8 +147,10 @@  static int parse_num64(uint64_t *num64, char *token)
 			switch (token[len - 2]) {
 			case 'G':
 				shift += 10;
+				/* fall through */
 			case 'M':
 				shift += 10;
+				/* fall through */
 			case 'k':
 				shift += 10;
 				token[len - 2] = 0;