Skip to contentSkip to conversation

tty/n_hdlc: mark expected switch fall-through

PATCH In review Gustavo A. R. Silva 2 participants 2 messages Feb 12, 2019 – Feb 13, 2019 TTY layer and serial drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tty/n_hdlc: 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 warning:

drivers/tty/n_hdlc.c: In function ‘n_hdlc_tty_ioctl’:
drivers/tty/n_hdlc.c:775:3: warning: this statement may fall through [-Wimplicit-fallthrough=]
switch (arg) {
^~~~~~
drivers/tty/n_hdlc.c:782:2: note: here
default:
^~~~~~~

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

Notice that, in this particular case, 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.

---
 drivers/tty/n_hdlc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/n_hdlc.c +1 -1
index 8bdf42bc8fc8..e55c79eb6430 100644
@@ -777,7 +777,7 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
 		case TCOFLUSH:
 			flush_tx_queue(tty);
 		}
-		/* fall through to default */
+		/* fall through - to default */
 
 	default:
 		error = n_tty_ioctl_helper(tty, file, cmd, arg);
Signature · 1 line
2.20.1
#1 lore raw
Quoted 9 lines · Gustavo A. R. Silva

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

This patch fixes the following warning:

drivers/tty/n_hdlc.c: In function ‘n_hdlc_tty_ioctl’:
drivers/tty/n_hdlc.c:775:3: warning: this statement may fall through [-Wimplicit-fallthrough=]

   switch (arg) {
   ^~~~~~
Quoted 8 lines

drivers/tty/n_hdlc.c:782:2: note: here
default:
^~~~~~~

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

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

Oh well, and that is:

Quoted 1 line

[ \t.!]*([Ee]lse,? |[Ii]ntentional(ly)? )?fall(s | |-)?thr(ough|u)[

\t.!]*(-[^\n\r]*)?

for implicit-fallthrough > 2.

Quoted 2 lines

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

But will we ever enable warning > 2? Does it even make sense?

Quoted 10 lines
---
 drivers/tty/n_hdlc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tty/n_hdlc.c +0 -0
index 8bdf42bc8fc8..e55c79eb6430 100644

drivers/tty/n_hdlc.c static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file, · line 780

Quoted 5 lines
drivers/tty/n_hdlc.c +1 -1
@@ -777,7 +777,7 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
 		case TCOFLUSH:
 			flush_tx_queue(tty);
 		}
-		/* fall through to default */
+		/* fall through - to default */

As the former makes more sense than the latter here.

drivers/tty/n_hdlc.c static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,

Quoted 3 lines
drivers/tty/n_hdlc.c +0 -0
 	default:
 		error = n_tty_ioctl_helper(tty, file, cmd, arg);
 

thanks,

Signature · 2 lines
js
suse labs