serial: cpm_uart: Remove custom frame size calculation

The number of bits can be calculated using helpers in core, no need for
the driver to do it on its own.

The mode register is programmed with frame bits minus 1, rearrange the
comments related to that "feature" closer to the actual write.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20220830084925.5608-3-ilpo.jarvinen@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index a4713cb0304d0181524763254fdefda326dc8203..2a273faa2d76b10a8b4bcb752467075be4da7c82 100644 (file)
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
@@ -489,7 +489,6 @@ static void cpm_uart_set_termios(struct uart_port *port,
        int baud;
        unsigned long flags;
        u16 cval, scval, prev_mode;
-       int bits, sbits;
        struct uart_cpm_port *pinfo =
                container_of(port, struct uart_cpm_port, port);
        smc_t __iomem *smcp = pinfo->smcp;
@@ -515,28 +514,17 @@ static void cpm_uart_set_termios(struct uart_port *port,
        if (maxidl > 0x10)
                maxidl = 0x10;
 
-       /* Character length programmed into the mode register is the
-        * sum of: 1 start bit, number of data bits, 0 or 1 parity bit,
-        * 1 or 2 stop bits, minus 1.
-        * The value 'bits' counts this for us.
-        */
        cval = 0;
        scval = 0;
 
-       /* byte size */
-       bits = tty_get_char_size(termios->c_cflag);
-       sbits = bits - 5;
-
        if (termios->c_cflag & CSTOPB) {
                cval |= SMCMR_SL;       /* Two stops */
                scval |= SCU_PSMR_SL;
-               bits++;
        }
 
        if (termios->c_cflag & PARENB) {
                cval |= SMCMR_PEN;
                scval |= SCU_PSMR_PEN;
-               bits++;
                if (!(termios->c_cflag & PARODD)) {
                        cval |= SMCMR_PM_EVEN;
                        scval |= (SCU_PSMR_REVP | SCU_PSMR_TEVP);
@@ -580,12 +568,9 @@ static void cpm_uart_set_termios(struct uart_port *port,
 
        spin_lock_irqsave(&port->lock, flags);
 
-       /* Start bit has not been added (so don't, because we would just
-        * subtract it later), and we need to add one for the number of
-        * stops bits (there is always at least one).
-        */
-       bits++;
        if (IS_SMC(pinfo)) {
+               unsigned int bits = tty_get_frame_size(termios->c_cflag);
+
                /*
                 * MRBLR can be changed while an SMC/SCC is operating only
                 * if it is done in a single bus cycle with one 16-bit move
@@ -604,13 +589,17 @@ static void cpm_uart_set_termios(struct uart_port *port,
                 */
                prev_mode = in_be16(&smcp->smc_smcmr) & (SMCMR_REN | SMCMR_TEN);
                /* Output in *one* operation, so we don't interrupt RX/TX if they
-                * were already enabled. */
-               out_be16(&smcp->smc_smcmr, smcr_mk_clen(bits) | cval |
-                   SMCMR_SM_UART | prev_mode);
+                * were already enabled.
+                * Character length programmed into the register is frame bits minus 1.
+                */
+               out_be16(&smcp->smc_smcmr, smcr_mk_clen(bits - 1) | cval |
+                                          SMCMR_SM_UART | prev_mode);
        } else {
+               unsigned int bits = tty_get_char_size(termios->c_cflag);
+
                out_be16(&pinfo->sccup->scc_genscc.scc_mrblr, pinfo->rx_fifosize);
                out_be16(&pinfo->sccup->scc_maxidl, maxidl);
-               out_be16(&sccp->scc_psmr, (sbits << 12) | scval);
+               out_be16(&sccp->scc_psmr, (UART_LCR_WLEN(bits) << 12) | scval);
        }
 
        if (pinfo->clk)