]> git.baikalelectronics.ru Git - kernel.git/commitdiff
serial: 8250_dwlib: Remove serial_rs485 sanitization
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 6 Jun 2022 10:04:22 +0000 (13:04 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Jun 2022 11:49:57 +0000 (13:49 +0200)
Serial core handles serial_rs485 sanitization and rs485 struct
assignment. As serial_rs485 is already clear for the non-RS485 case by
serial core, there no need to clear flags in the driver.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20220606100433.13793-26-ilpo.jarvinen@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_dwlib.c

index 120b29519d7430c2e0b75cd7ca3196b35d4cd35a..c83e7eaf38771e802d6527c6c4874f77864b59e2 100644 (file)
@@ -93,9 +93,6 @@ static int dw8250_rs485_config(struct uart_port *p, struct serial_rs485 *rs485)
        tcr &= ~DW_UART_TCR_XFER_MODE;
 
        if (rs485->flags & SER_RS485_ENABLED) {
-               /* Clear unsupported flags. */
-               rs485->flags &= SER_RS485_ENABLED | SER_RS485_RX_DURING_TX |
-                               SER_RS485_RTS_ON_SEND | SER_RS485_RTS_AFTER_SEND;
                tcr |= DW_UART_TCR_RS485_EN;
 
                if (rs485->flags & SER_RS485_RX_DURING_TX) {
@@ -111,8 +108,6 @@ static int dw8250_rs485_config(struct uart_port *p, struct serial_rs485 *rs485)
                dw8250_writel_ext(p, DW_UART_DE_EN, 1);
                dw8250_writel_ext(p, DW_UART_RE_EN, 1);
        } else {
-               rs485->flags = 0;
-
                tcr &= ~DW_UART_TCR_RS485_EN;
        }
 
@@ -127,11 +122,6 @@ static int dw8250_rs485_config(struct uart_port *p, struct serial_rs485 *rs485)
 
        dw8250_writel_ext(p, DW_UART_TCR, tcr);
 
-       rs485->delay_rts_before_send = 0;
-       rs485->delay_rts_after_send = 0;
-
-       p->rs485 = *rs485;
-
        return 0;
 }