]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
memstick: mark expected switch fall-throughs
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Wed, 13 Feb 2019 02:54:56 +0000 (20:54 -0600)
committerGustavo A. R. Silva <gustavo@embeddedor.com>
Tue, 23 Apr 2019 15:29:58 +0000 (10:29 -0500)
In preparation to enabling -Wimplicit-fallthrough, mark switch
cases where we are expecting to fall through.

This patch fixes the following warnings:

drivers/memstick/host/jmb38x_ms.c: In function ‘jmb38x_ms_write_data’:
drivers/memstick/host/jmb38x_ms.c:261:15: warning: this statement may fall through [-Wimplicit-fallthrough=]
   host->io_pos++;
   ~~~~~~~~~~~~^~
drivers/memstick/host/jmb38x_ms.c:262:2: note: here
  case 2:
  ^~~~
drivers/memstick/host/jmb38x_ms.c:264:15: warning: this statement may fall through [-Wimplicit-fallthrough=]
   host->io_pos++;
   ~~~~~~~~~~~~^~
drivers/memstick/host/jmb38x_ms.c:265:2: note: here
  case 1:
  ^~~~
drivers/memstick/host/tifm_ms.c: In function ‘tifm_ms_write_data’:
drivers/memstick/host/tifm_ms.c:168:15: warning: this statement may fall through [-Wimplicit-fallthrough=]
   host->io_pos++;
   ~~~~~~~~~~~~^~
drivers/memstick/host/tifm_ms.c:169:2: note: here
  case 2:
  ^~~~
drivers/memstick/host/tifm_ms.c:171:15: warning: this statement may fall through [-Wimplicit-fallthrough=]
   host->io_pos++;
   ~~~~~~~~~~~~^~
drivers/memstick/host/tifm_ms.c:172:2: note: here
  case 1:
  ^~~~

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

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

Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
drivers/memstick/host/jmb38x_ms.c
drivers/memstick/host/tifm_ms.c

index bcdca9fbef51cc802d34b74a4fab19abd308b1bc..49c71f55489fe71e62c84748c2624e74bc15f6e3 100644 (file)
@@ -259,9 +259,11 @@ static unsigned int jmb38x_ms_write_data(struct jmb38x_ms_host *host,
        case 3:
                host->io_word[0] |= buf[off + 2] << 16;
                host->io_pos++;
+               /* fall through */
        case 2:
                host->io_word[0] |= buf[off + 1] << 8;
                host->io_pos++;
+               /* fall through */
        case 1:
                host->io_word[0] |= buf[off];
                host->io_pos++;
index bed205849d027020e260dfa4b68ac3fba8aaa9ed..1bbb2ead9556df85ccd440ef1dabb62887f4e1e8 100644 (file)
@@ -166,9 +166,11 @@ static unsigned int tifm_ms_write_data(struct tifm_ms *host,
        case 3:
                host->io_word |= buf[off + 2] << 16;
                host->io_pos++;
+               /* fall through */
        case 2:
                host->io_word |= buf[off + 1] << 8;
                host->io_pos++;
+               /* fall through */
        case 1:
                host->io_word |= buf[off];
                host->io_pos++;