Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6eaa79ff authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Bartlomiej Zolnierkiewicz
Browse files

video: fbdev: s3c-fb: 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/video/fbdev/s3c-fb.c: In function ‘s3c_fb_blank’:
drivers/video/fbdev/s3c-fb.c:811:16: warning: this statement may fall through [-Wimplicit-fallthrough=]
   sfb->enabled &= ~(1 << index);
   ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
drivers/video/fbdev/s3c-fb.c:814:2: note: here
  case FB_BLANK_NORMAL:
  ^~~~
  LD [M]  drivers/staging/greybus/gb-light.o
  CC [M]  drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp10b.o
drivers/video/fbdev/s3c-fb.c: In function ‘s3c_fb_check_var’:
drivers/video/fbdev/s3c-fb.c:286:22: warning: this statement may fall through [-Wimplicit-fallthrough=]
   var->transp.length = 1;
   ~~~~~~~~~~~~~~~~~~~^~~
drivers/video/fbdev/s3c-fb.c:288:2: note: here
  case 18:
  ^~~~
drivers/video/fbdev/s3c-fb.c:314:22: warning: this statement may fall through [-Wimplicit-fallthrough=]
   var->transp.offset = 24;
   ~~~~~~~~~~~~~~~~~~~^~~~
drivers/video/fbdev/s3c-fb.c:316:2: note: here
  case 24:
  ^~~~

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

Notice that, in this particular case, the code comments are modified
in accordance with what GCC is expecting to find.

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

Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Cc: Jingoo Han <jingoohan1@gmail.com>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 796e2f41

drivers/video/fbdev/s3c-fb.c

+3 −3
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var, 
		/* 666 with one bit alpha/transparency */

		var->transp.offset	= 18;

		var->transp.length	= 1;

		/* drop through */

		/* fall through */

	case 18:

		var->bits_per_pixel	= 32;
@@ -315,7 +315,7 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var, 
	case 25:

		var->transp.length	= var->bits_per_pixel - 24;

		var->transp.offset	= 24;

		/* drop through */

		/* fall through */

	case 24:

		/* our 24bpp is unpacked, so 32bpp */

		var->bits_per_pixel	= 32;
@@ -812,7 +812,7 @@ static int s3c_fb_blank(int blank_mode, struct fb_info *info) 
	case FB_BLANK_POWERDOWN:

		wincon &= ~WINCONx_ENWIN;

		sfb->enabled &= ~(1 << index);

		/* fall through to FB_BLANK_NORMAL */

		/* fall through - to FB_BLANK_NORMAL */



	case FB_BLANK_NORMAL:

		/* disable the DMA and display 0x0 (black) */