luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: cfi_util: mark expected switch fall-throughs

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

This patch fixes the following warnings:

drivers/mtd/chips/cfi_util.c: In function ‘cfi_build_cmd’:
drivers/mtd/chips/cfi_util.c:110:10: warning: this statement may fall through [-Wimplicit-fallthrough=]
   onecmd |= (onecmd << (chip_mode * 32));
   ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/mtd/chips/cfi_util.c:112:2: note: here
  case 4:
  ^~~~
drivers/mtd/chips/cfi_util.c:113:10: warning: this statement may fall through [-Wimplicit-fallthrough=]
   onecmd |= (onecmd << (chip_mode * 16));
   ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/mtd/chips/cfi_util.c:114:2: note: here
  case 2:
  ^~~~
drivers/mtd/chips/cfi_util.c: In function ‘cfi_merge_status’:
drivers/mtd/chips/cfi_util.c:163:7: warning: this statement may fall through [-Wimplicit-fallthrough=]
   res |= (onestat >> (chip_mode * 32));
   ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/mtd/chips/cfi_util.c:165:2: note: here
  case 4:
  ^~~~
drivers/mtd/chips/cfi_util.c:166:7: warning: this statement may fall through [-Wimplicit-fallthrough=]
   res |= (onestat >> (chip_mode * 16));
   ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/mtd/chips/cfi_util.c:167:2: note: here
  case 2:
  ^~~~

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>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Gustavo A. R. Silva 2019-02-08 12:02:02 -06:00 committed by Richard Weinberger
parent 553f0459b8
commit 660e171675
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mtd/chips/cfi_util.c
View File

@ -109,10 +109,13 @@ map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cfi_private *cfi
case 8: case 8:
onecmd |= (onecmd << (chip_mode * 32)); onecmd |= (onecmd << (chip_mode * 32));
#endif #endif
/* fall through */
case 4: case 4:
onecmd |= (onecmd << (chip_mode * 16)); onecmd |= (onecmd << (chip_mode * 16));
/* fall through */
case 2: case 2:
onecmd |= (onecmd << (chip_mode * 8)); onecmd |= (onecmd << (chip_mode * 8));
/* fall through */
case 1: case 1:
; ;
} }
@ -162,10 +165,13 @@ unsigned long cfi_merge_status(map_word val, struct map_info *map,
case 8: case 8:
res |= (onestat >> (chip_mode * 32)); res |= (onestat >> (chip_mode * 32));
#endif #endif
/* fall through */
case 4: case 4:
res |= (onestat >> (chip_mode * 16)); res |= (onestat >> (chip_mode * 16));
/* fall through */
case 2: case 2:
res |= (onestat >> (chip_mode * 8)); res |= (onestat >> (chip_mode * 8));
/* fall through */
case 1: case 1:
; ;
} }