]> git.itanic.dy.fi Git - linux-stable/commitdiff
serial: atmel: remove redundant assignment in rs485_config
authorLino Sanfilippo <LinoSanfilippo@gmx.de>
Sun, 10 Apr 2022 10:46:42 +0000 (12:46 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Sep 2022 12:15:46 +0000 (14:15 +0200)
[ Upstream commit 60efd0513916f195dd85bfbf21653f74f9ab019c ]

In uart_set_rs485_config() the serial core already assigns the passed
serial_rs485 struct to the uart port.

So remove the assignment from the drivers rs485_config() function to avoid
redundancy.

Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Link: https://lore.kernel.org/r/20220410104642.32195-10-LinoSanfilippo@gmx.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 692a8ebcfc24 ("tty: serial: atmel: Preserve previous USART mode if RS485 disabled")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/tty/serial/atmel_serial.c

index dd350c59088045c6e8ce579554b3e71ad7beef53..92383c8610eeb37e0eced2d878be39ab9b0b4857 100644 (file)
@@ -298,11 +298,9 @@ static int atmel_config_rs485(struct uart_port *port,
        /* Resetting serial mode to RS232 (0x0) */
        mode &= ~ATMEL_US_USMODE;
 
-       port->rs485 = *rs485conf;
-
        if (rs485conf->flags & SER_RS485_ENABLED) {
                dev_dbg(port->dev, "Setting UART to RS485\n");
-               if (port->rs485.flags & SER_RS485_RX_DURING_TX)
+               if (rs485conf->flags & SER_RS485_RX_DURING_TX)
                        atmel_port->tx_done_mask = ATMEL_US_TXRDY;
                else
                        atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;