| Message ID | 20220410104642.32195-10-LinoSanfilippo@gmx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v4,RESEND,1/9] serial: core: move RS485 configuration tasks from drivers into core | expand |
On 10.04.2022 13:46, Lino Sanfilippo wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > 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. > > Acked-by: Richard Genoud <richard.genoud@gmail.com> > Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de> Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com> > --- > 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 3a45e4fc7993..dd1c7e4bd1c9 100644 > --- a/drivers/tty/serial/atmel_serial.c > +++ b/drivers/tty/serial/atmel_serial.c > @@ -299,11 +299,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 > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 3a45e4fc7993..dd1c7e4bd1c9 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -299,11 +299,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;