Commit 660e1716 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Richard Weinberger

mtd: cfi_util: mark expected switch fall-throughs

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: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 553f0459
...@@ -109,10 +109,13 @@ map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cfi_private *cfi ...@@ -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, ...@@ -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:
; ;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment