serial: stm32: remove redundant code in rs485_config

In uart_set_rs485_config() the serial core already ensures that only one of
both options RTS on send or RTS after send is set. It also assigns the
passed serial_rs485 struct to the uart port.

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

Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Link: https://lore.kernel.org/r/20220410104642.32195-4-LinoSanfilippo@gmx.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c
index 87b5cd4c9743eabd0e96fc872f61c93cd4682b7e..f886976daef6dc62bb2bce26402d9fce1b9255e8 100644 (file)
--- a/drivers/tty/serial/stm32-usart.c
+++ b/drivers/tty/serial/stm32-usart.c
@@ -107,8 +107,6 @@ static int stm32_usart_config_rs485(struct uart_port *port,
 
        stm32_usart_clr_bits(port, ofs->cr1, BIT(cfg->uart_enable_bit));
 
-       port->rs485 = *rs485conf;
-
        rs485conf->flags |= SER_RS485_RX_DURING_TX;
 
        if (rs485conf->flags & SER_RS485_ENABLED) {
@@ -128,13 +126,10 @@ static int stm32_usart_config_rs485(struct uart_port *port,
                                             rs485conf->delay_rts_after_send,
                                             baud);
 
-               if (rs485conf->flags & SER_RS485_RTS_ON_SEND) {
+               if (rs485conf->flags & SER_RS485_RTS_ON_SEND)
                        cr3 &= ~USART_CR3_DEP;
-                       rs485conf->flags &= ~SER_RS485_RTS_AFTER_SEND;
-               } else {
+               else
                        cr3 |= USART_CR3_DEP;
-                       rs485conf->flags |= SER_RS485_RTS_AFTER_SEND;
-               }
 
                writel_relaxed(cr3, port->membase + ofs->cr3);
                writel_relaxed(cr1, port->membase + ofs->cr1);