Commit ca5dc2d1 authored Feb 12, 2019 by Gustavo A. R. Silva Committed by Greg Kroah-Hartman Feb 13, 2019

char: lp: mark expected switch fall-through



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

This patch fixes the following warnings:

drivers/char/lp.c: In function ‘lp_compat_ioctl’:
drivers/char/lp.c:756:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
   if (!COMPAT_USE_64BIT_TIME) {
      ^
drivers/char/lp.c:761:2: note: here
  case LPSETTIMEOUT_NEW:
  ^~~~
drivers/char/lp.c: In function ‘lp_ioctl’:
drivers/char/lp.c:728:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
   if (BITS_PER_LONG == 32) {
      ^
drivers/char/lp.c:733:2: note: here
  case LPSETTIMEOUT_NEW:
  ^~~~

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

Notice that in some cases, the code comment is 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: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 1aec4211

drivers/char/lp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -729,7 +729,7 @@ static long lp_ioctl(struct file *file, unsigned int cmd,
		ret = lp_set_timeout32(minor, (void __user *)arg);
		break;
		}
		/* fallthrough for 64-bit */
		/* fall through - for 64-bit */
		case LPSETTIMEOUT_NEW:
		ret = lp_set_timeout64(minor, (void __user *)arg);
		break;
		@@ -757,7 +757,7 @@ static long lp_compat_ioctl(struct file *file, unsigned int cmd,
		ret = lp_set_timeout32(minor, (void __user *)arg);
		break;
		}
		/* fallthrough for x32 mode */
		/* fall through - for x32 mode */
		case LPSETTIMEOUT_NEW:
		ret = lp_set_timeout64(minor, (void __user *)arg);
		break;

Admin message