Commit e56a4028 authored Apr 10, 2022 by Lino Sanfilippo Committed by Greg Kroah-Hartman Sep 28, 2022

serial: atmel: remove redundant assignment in rs485_config



[ 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>

parent 85a64208

drivers/tty/serial/atmel_serial.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -309,11 +309,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;