tty: make use of tty_get_{char,frame}_size

In the previous patch, we introduced tty_get_char_size() and
tty_get_frame_size() for computing character and frame sizes,
respectively. Here, we make use of them in various tty drivers where
applicable.

The stats look nice: 12 insertions, 169 deletions.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Lin <dtwlin@gmail.com>
Cc: Johan Hovold <johan@kernel.org>
Cc: Alex Elder <elder@kernel.org>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Andy Gross <agross@kernel.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Oliver Neukum <oneukum@suse.com>
Acked-by: Alex Elder <elder@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210610090247.2593-4-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 9f7420bc50267cc913880aab66d3416ad3e11f77..6eaefea0520ebbb736b605d9bd7c9a40e6a2e03c 100644 (file)
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -1419,13 +1419,7 @@ static void mgslpc_change_params(MGSLPC_INFO *info, struct tty_struct *tty)
 
        /* byte size and parity */
 
-       switch (cflag & CSIZE) {
-       case CS5: info->params.data_bits = 5; break;
-       case CS6: info->params.data_bits = 6; break;
-       case CS7: info->params.data_bits = 7; break;
-       case CS8: info->params.data_bits = 8; break;
-       default:  info->params.data_bits = 7; break;
-       }
+       info->params.data_bits = tty_get_char_size(cflag);
 
        if (cflag & CSTOPB)
                info->params.stop_bits = 2;

diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c
index ccfaa0f21b9c27edf5ed5220706d9d0109e25166..73f01ed1e5b7296fe914368e4fddefc59af3416d 100644 (file)
--- a/drivers/staging/greybus/uart.c
+++ b/drivers/staging/greybus/uart.c
@@ -494,21 +494,7 @@ static void gb_tty_set_termios(struct tty_struct *tty,
                                (termios->c_cflag & PARODD ? 1 : 2) +
                                (termios->c_cflag & CMSPAR ? 2 : 0) : 0;
 
-       switch (termios->c_cflag & CSIZE) {
-       case CS5:
-               newline.data_bits = 5;
-               break;
-       case CS6:
-               newline.data_bits = 6;
-               break;
-       case CS7:
-               newline.data_bits = 7;
-               break;
-       case CS8:
-       default:
-               newline.data_bits = 8;
-               break;
-       }
+       newline.data_bits = tty_get_char_size(termios->c_cflag);
 
        /* FIXME: needs to clear unsupported bits in the termios */
        gb_tty->clocal = ((termios->c_cflag & CLOCAL) != 0);

diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index 58aaa533203bde9f3db59a9fb983bcd803810afe..c719aa2b183283217cf4665efaf6ebb6011b7f5e 100644 (file)
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -524,24 +524,7 @@ static void cpm_uart_set_termios(struct uart_port *port,
        scval = 0;
 
        /* byte size */
-       switch (termios->c_cflag & CSIZE) {
-       case CS5:
-               bits = 5;
-               break;
-       case CS6:
-               bits = 6;
-               break;
-       case CS7:
-               bits = 7;
-               break;
-       case CS8:
-               bits = 8;
-               break;
-               /* Never happens, but GCC is too dumb to figure it out */
-       default:
-               bits = 8;
-               break;
-       }
+       bits = tty_get_char_size(termios->c_cflag);
        sbits = bits - 5;
 
        if (termios->c_cflag & CSTOPB) {

diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 7b4b6bb75424758283e597cd6bf37d1b8cce27d1..ac45f3386e97449f7bed08b7c4c770f6f63afafa 100644 (file)
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -962,7 +962,7 @@ static void mxs_auart_settermios(struct uart_port *u,
                                 struct ktermios *old)
 {
        struct mxs_auart_port *s = to_auart_port(u);
-       u32 bm, ctrl, ctrl2, div;
+       u32 ctrl, ctrl2, div;
        unsigned int cflag, baud, baud_min, baud_max;
 
        cflag = termios->c_cflag;
@@ -970,25 +970,7 @@ static void mxs_auart_settermios(struct uart_port *u,
        ctrl = AUART_LINECTRL_FEN;
        ctrl2 = mxs_read(s, REG_CTRL2);
 
-       /* byte size */
-       switch (cflag & CSIZE) {
-       case CS5:
-               bm = 5;
-               break;
-       case CS6:
-               bm = 6;
-               break;
-       case CS7:
-               bm = 7;
-               break;
-       case CS8:
-               bm = 8;
-               break;
-       default:
-               return;
-       }
-
-       ctrl |= AUART_LINECTRL_WLEN(bm);
+       ctrl |= AUART_LINECTRL_WLEN(tty_get_char_size(cflag));
 
        /* parity */
        if (cflag & PARENB) {

diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index 463f84a66f6e95930963b0868b9392fabdc1d5ce..379ab15daa85bd651408797be85b40fd70dc27c7 100644 (file)
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -1050,21 +1050,7 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
        }
 
        /* bits per char */
-       switch (termios->c_cflag & CSIZE) {
-       case CS5:
-               bits_per_char = 5;
-               break;
-       case CS6:
-               bits_per_char = 6;
-               break;
-       case CS7:
-               bits_per_char = 7;
-               break;
-       case CS8:
-       default:
-               bits_per_char = 8;
-               break;
-       }
+       bits_per_char = tty_get_char_size(termios->c_cflag);
 
        /* stop bits */
        if (termios->c_cflag & CSTOPB)

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index aabe66c99c1ae976b23dac446579c0cf47f77a35..07eb56294371bb6c4f7ce511b1c4f64d44e530b7 100644 (file)
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -2500,25 +2500,7 @@ done:
        uart_update_timeout(port, termios->c_cflag, baud);
 
        /* byte size and parity */
-       switch (termios->c_cflag & CSIZE) {
-       case CS5:
-               bits = 7;
-               break;
-       case CS6:
-               bits = 8;
-               break;
-       case CS7:
-               bits = 9;
-               break;
-       default:
-               bits = 10;
-               break;
-       }
-
-       if (termios->c_cflag & CSTOPB)
-               bits++;
-       if (termios->c_cflag & PARENB)
-               bits++;
+       bits = tty_get_frame_size(termios->c_cflag);
 
        if (sci_getreg(port, SEMR)->size)
                serial_port_out(port, SEMR, 0);

diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c
index cd6adb979df95afed0f1cf46fde1ac913f374a1d..ef793b3b459161fbc8ecde34bc2a5bf3b27adeaa 100644 (file)
--- a/drivers/tty/serial/stm32-usart.c
+++ b/drivers/tty/serial/stm32-usart.c
@@ -718,36 +718,6 @@ static void stm32_usart_shutdown(struct uart_port *port)
        free_irq(port->irq, port);
 }
 
-static unsigned int stm32_usart_get_databits(struct ktermios *termios)
-{
-       unsigned int bits;
-
-       tcflag_t cflag = termios->c_cflag;
-
-       switch (cflag & CSIZE) {
-       /*
-        * CSIZE settings are not necessarily supported in hardware.
-        * CSIZE unsupported configurations are handled here to set word length
-        * to 8 bits word as default configuration and to print debug message.
-        */
-       case CS5:
-               bits = 5;
-               break;
-       case CS6:
-               bits = 6;
-               break;
-       case CS7:
-               bits = 7;
-               break;
-       /* default including CS8 */
-       default:
-               bits = 8;
-               break;
-       }
-
-       return bits;
-}
-
 static void stm32_usart_set_termios(struct uart_port *port,
                                    struct ktermios *termios,
                                    struct ktermios *old)
@@ -805,7 +775,7 @@ static void stm32_usart_set_termios(struct uart_port *port,
        if (cflag & CSTOPB)
                cr2 |= USART_CR2_STOP_2B;
 
-       bits = stm32_usart_get_databits(termios);
+       bits = tty_get_char_size(cflag);
        stm32_port->rdr_mask = (BIT(bits) - 1);
 
        if (cflag & PARENB) {

diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index cf87dc66087b3d46e1d34963d673b509b9aac449..5bb928b7873e705235a5929930f6456425d802ba 100644 (file)
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -2465,14 +2465,7 @@ static void change_params(struct slgt_info *info)
 
        /* byte size and parity */
 
-       switch (cflag & CSIZE) {
-       case CS5: info->params.data_bits = 5; break;
-       case CS6: info->params.data_bits = 6; break;
-       case CS7: info->params.data_bits = 7; break;
-       case CS8: info->params.data_bits = 8; break;
-       default:  info->params.data_bits = 7; break;
-       }
-
+       info->params.data_bits = tty_get_char_size(cflag);
        info->params.stop_bits = (cflag & CSTOPB) ? 2 : 1;
 
        if (cflag & PARENB)

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 81199efe0312fe9a4e0da8e6f6ddc87dc69447a5..c9954eb56e001aa6e16d542e4151b262fff2e12f 100644 (file)
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1056,21 +1056,8 @@ static void acm_tty_set_termios(struct tty_struct *tty,
        newline.bParityType = termios->c_cflag & PARENB ?
                                (termios->c_cflag & PARODD ? 1 : 2) +
                                (termios->c_cflag & CMSPAR ? 2 : 0) : 0;
-       switch (termios->c_cflag & CSIZE) {
-       case CS5:
-               newline.bDataBits = 5;
-               break;
-       case CS6:
-               newline.bDataBits = 6;
-               break;
-       case CS7:
-               newline.bDataBits = 7;
-               break;
-       case CS8:
-       default:
-               newline.bDataBits = 8;
-               break;
-       }
+       newline.bDataBits = tty_get_char_size(termios->c_cflag);
+
        /* FIXME: Needs to clear unsupported bits in the termios */
        acm->clocal = ((termios->c_cflag & CLOCAL) != 0);
 

diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index ed9193f3bb1a3d5176ba7a326c6e5d4c533e0c80..8107e4b5b03b17f22fb3e2ba0e6332cee68e9c7e 100644 (file)
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -356,25 +356,7 @@ static void belkin_sa_set_termios(struct tty_struct *tty,
 
        /* set the number of data bits */
        if ((cflag & CSIZE) != (old_cflag & CSIZE)) {
-               switch (cflag & CSIZE) {
-               case CS5:
-                       urb_value = BELKIN_SA_DATA_BITS(5);
-                       break;
-               case CS6:
-                       urb_value = BELKIN_SA_DATA_BITS(6);
-                       break;
-               case CS7:
-                       urb_value = BELKIN_SA_DATA_BITS(7);
-                       break;
-               case CS8:
-                       urb_value = BELKIN_SA_DATA_BITS(8);
-                       break;
-               default:
-                       dev_dbg(&port->dev,
-                               "CSIZE was not CS5-CS8, using default of 8\n");
-                       urb_value = BELKIN_SA_DATA_BITS(8);
-                       break;
-               }
+               urb_value = BELKIN_SA_DATA_BITS(tty_get_char_size(cflag));
                if (BSA_USB_CMD(BELKIN_SA_SET_DATA_BITS_REQUEST, urb_value) < 0)
                        dev_err(&port->dev, "Set data bits error\n");
        }

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 4dea3ec2d8b59c3a4f2db8e5b71c4f21a75aaabb..55f23df03e0ba72e59230bd518b8156a51affd9f 100644 (file)
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -887,23 +887,8 @@ static void cypress_set_termios(struct tty_struct *tty,
        } else
                parity_enable = parity_type = 0;
 
-       switch (cflag & CSIZE) {
-       case CS5:
-               data_bits = 5;
-               break;
-       case CS6:
-               data_bits = 6;
-               break;
-       case CS7:
-               data_bits = 7;
-               break;
-       case CS8:
-               data_bits = 8;
-               break;
-       default:
-               dev_err(dev, "%s - CSIZE was set, but not CS5-CS8\n", __func__);
-               data_bits = 8;
-       }
+       data_bits = tty_get_char_size(cflag);
+
        spin_lock_irqsave(&priv->lock, flags);
        oldlines = priv->line_control;
        if ((cflag & CBAUD) == B0) {

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 940050c314822539260a99361dcc723e6490d1a6..2f2f5047452bc4d6ac62dee1075a06d1f0d914bd 100644 (file)
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -789,20 +789,7 @@ static void pl2303_set_termios(struct tty_struct *tty,
 
        pl2303_get_line_request(port, buf);
 
-       switch (C_CSIZE(tty)) {
-       case CS5:
-               buf[6] = 5;
-               break;
-       case CS6:
-               buf[6] = 6;
-               break;
-       case CS7:
-               buf[6] = 7;
-               break;
-       default:
-       case CS8:
-               buf[6] = 8;
-       }
+       buf[6] = tty_get_char_size(tty->termios.c_cflag);
        dev_dbg(&port->dev, "data bits = %d\n", buf[6]);
 
        /* For reference buf[0]:buf[3] baud rate value */

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 5116ed9db3eb41e0bb1e4570a69b67af00c9392a..da65d14c9ed5e2a8c1851ceac939108fb7b0041c 100644 (file)
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -625,14 +625,7 @@ static void firm_setup_port(struct tty_struct *tty)
 
        port_settings.port = port->port_number + 1;
 
-       /* get the byte size */
-       switch (cflag & CSIZE) {
-       case CS5:       port_settings.bits = 5;   break;
-       case CS6:       port_settings.bits = 6;   break;
-       case CS7:       port_settings.bits = 7;   break;
-       default:
-       case CS8:       port_settings.bits = 8;   break;
-       }
+       port_settings.bits = tty_get_char_size(cflag);
        dev_dbg(dev, "%s - data bits = %d\n", __func__, port_settings.bits);
 
        /* determine the parity */