lkml.org 
[lkml]   [2022]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 023/141] serial: atmel: remove redundant assignment in rs485_config
    Date
    From: Lino Sanfilippo <LinoSanfilippo@gmx.de>

    [ 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 | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
    index 602065bfc9bb..e7526060926d 100644
    --- a/drivers/tty/serial/atmel_serial.c
    +++ b/drivers/tty/serial/atmel_serial.c
    @@ -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;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-26 13:01    [W:4.047 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site