Commit ccaa7518 authored Feb 12, 2019 by Gustavo A. R. Silva

memstick: 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/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>

parent 322b38ce

drivers/memstick/host/jmb38x_ms.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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++;

drivers/memstick/host/tifm_ms.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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++;