Commit e5d4d733 authored by Lino Sanfilippo's avatar Lino Sanfilippo Committed by Greg Kroah-Hartman
Browse files

serial: fsl_lpuart: remove redundant code in rs485_config functions 



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: default avatarLino Sanfilippo <LinoSanfilippo@gmx.de>
Link: https://lore.kernel.org/r/20220410104642.32195-9-LinoSanfilippo@gmx.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 91516246

drivers/tty/serial/fsl_lpuart.c

+0 −32
Original line number Diff line number Diff line
@@ -1377,19 +1377,6 @@ static int lpuart_config_rs485(struct uart_port *port, 
		/* Enable auto RS-485 RTS mode */

		modem |= UARTMODEM_TXRTSE;



		/*

		 * RTS needs to be logic HIGH either during transfer _or_ after

		 * transfer, other variants are not supported by the hardware.

		 */



		if (!(rs485->flags & (SER_RS485_RTS_ON_SEND |

				SER_RS485_RTS_AFTER_SEND)))

			rs485->flags |= SER_RS485_RTS_ON_SEND;



		if (rs485->flags & SER_RS485_RTS_ON_SEND &&

				rs485->flags & SER_RS485_RTS_AFTER_SEND)

			rs485->flags &= ~SER_RS485_RTS_AFTER_SEND;



		/*

		 * The hardware defaults to RTS logic HIGH while transfer.

		 * Switch polarity in case RTS shall be logic HIGH
@@ -1402,9 +1389,6 @@ static int lpuart_config_rs485(struct uart_port *port, 
			modem |= UARTMODEM_TXRTSPOL;

	}



	/* Store the new configuration */

	sport->port.rs485 = *rs485;



	writeb(modem, sport->port.membase + UARTMODEM);

	return 0;

}
@@ -1428,19 +1412,6 @@ static int lpuart32_config_rs485(struct uart_port *port, 
		/* Enable auto RS-485 RTS mode */

		modem |= UARTMODEM_TXRTSE;



		/*

		 * RTS needs to be logic HIGH either during transfer _or_ after

		 * transfer, other variants are not supported by the hardware.

		 */



		if (!(rs485->flags & (SER_RS485_RTS_ON_SEND |

				SER_RS485_RTS_AFTER_SEND)))

			rs485->flags |= SER_RS485_RTS_ON_SEND;



		if (rs485->flags & SER_RS485_RTS_ON_SEND &&

				rs485->flags & SER_RS485_RTS_AFTER_SEND)

			rs485->flags &= ~SER_RS485_RTS_AFTER_SEND;



		/*

		 * The hardware defaults to RTS logic HIGH while transfer.

		 * Switch polarity in case RTS shall be logic HIGH
@@ -1453,9 +1424,6 @@ static int lpuart32_config_rs485(struct uart_port *port, 
			modem |= UARTMODEM_TXRTSPOL;

	}



	/* Store the new configuration */

	sport->port.rs485 = *rs485;



	lpuart32_write(&sport->port, modem, UARTMODIR);

	return 0;

}