Skip to contentSkip to conversation

USB: serial: Use fallthrough pseudo-keyword

PATCH Applied Gustavo A. R. Silva 2 participants 3 messages Jul 7, 2020 – Jul 8, 2020

Subsystems (2)
USB USB serial
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 USB: serial: Use fallthrough pseudo-keyword

Replace the existing /* fall through */ comments and its variants with the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary fall-through markings when it is the case.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/usb/serial/cypress_m8.c  |    4 ++--
 drivers/usb/serial/io_edgeport.c |    4 ++--
 drivers/usb/serial/kobil_sct.c   |    2 +-
 drivers/usb/serial/upd78f0730.c  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/usb/serial/cypress_m8.c +2 -2
index 216edd5826ca..53e3051b0a71 100644
@@ -1046,7 +1046,7 @@ static void cypress_read_int_callback(struct urb *urb)
 		return;
 	case -EPIPE:
 		/* Can't call usb_clear_halt while in_interrupt */
-		/* FALLS THROUGH */
+		fallthrough;
 	default:
 		/* something ugly is going on... */
 		dev_err(dev, "%s - unexpected nonzero read status received: %d\n",

@@ -1195,7 +1195,7 @@ static void cypress_write_int_callback(struct urb *urb)
 		return;
 	case -EPIPE:
 		/* Cannot call usb_clear_halt while in_interrupt */
-		/* FALLTHROUGH */
+		fallthrough;
 	default:
 		dev_err(dev, "%s - unexpected nonzero write status received: %d\n",
 			__func__, status);
drivers/usb/serial/io_edgeport.c +2 -2
index 4cca0b836f43..ba5d8df69518 100644
@@ -1752,7 +1752,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial,
 				edge_serial->rxState = EXPECT_HDR2;
 				break;
 			}
-			/* Fall through */
+			fallthrough;
 		case EXPECT_HDR2:
 			edge_serial->rxHeader2 = *buffer;
 			++buffer;

@@ -1804,7 +1804,7 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial,
 				edge_serial->rxState = EXPECT_DATA;
 				break;
 			}
-			/* Fall through */
+			fallthrough;
 		case EXPECT_DATA: /* Expect data */
 			if (bufferLength < edge_serial->rxBytesRemaining) {
 				rxLen = bufferLength;
drivers/usb/serial/kobil_sct.c +1 -1
index e9882ba20933..9660c16be56a 100644
@@ -499,7 +499,7 @@ static void kobil_set_termios(struct tty_struct *tty,
 		break;
 	default:
 		speed = 9600;
-		/* fall through */
+		fallthrough;
 	case 9600:
 		urb_val = SUSBCR_SBR_9600;
 		break;
drivers/usb/serial/upd78f0730.c +1 -1
index 1ba1401d27d7..0a2268c479af 100644
@@ -332,7 +332,7 @@ static void upd78f0730_set_termios(struct tty_struct *tty,
 		tty->termios.c_cflag &= ~CSIZE;
 		tty->termios.c_cflag |= CS8;
 		dev_warn(dev, "data size is not supported, using 8 bits\n");
-		/* fall through */
+		fallthrough;
 	case CS8:
 		request.params |= UPD78F0730_DATA_SIZE_8_BITS;
 		dev_dbg(dev, "%s - 8 data bits\n", __func__);
author
#2 lore raw
Quoted 11 lines · Johan Hovold
Quoted 7 lines · Gustavo A. R. Silva

Replace the existing /* fall through */ comments and its variants with the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary fall-through markings when it is the case.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through

Signed-off-by Gustavo A. R. Silva <[email protected]>

Applied, thanks.

Thanks, Johan.

--
Gustavo