From: Lino Sanfilippo <LinoSanfilippo@gmx.de>
To: gregkh@linuxfoundation.org, jirislaby@kernel.org
Cc: linux@armlinux.org.uk, richard.genoud@gmail.com,
nicolas.ferre@microchip.com, alexandre.belloni@bootlin.com,
ludovic.desroches@microchip.com, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de,
festevam@gmail.com, linux-imx@nxp.com, mcoquelin.stm32@gmail.com,
alexandre.torgue@foss.st.com, linux-serial@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-stm32@st-md-mailman.stormreply.com, lukas@wunner.de,
Lino Sanfilippo <LinoSanfilippo@gmx.de>
Subject: [PATCH 2/9] serial: amba-pl011: remove redundant code in rs485_config
Date: Sun, 13 Feb 2022 23:27:30 +0100 [thread overview]
Message-ID: <20220213222737.15709-3-LinoSanfilippo@gmx.de> (raw)
In-Reply-To: <20220213222737.15709-1-LinoSanfilippo@gmx.de>
When RS485 is configured by userspace the serial core already
- checks for valid RTS settings
- nullifies the padding field of the passed serial_rs485 struct
- clamps the RTS delays
- assigns the passed configuration to the uart port struct
So remove these tasks from the code of the rs485_config function to avoid
redundancy.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
---
drivers/tty/serial/amba-pl011.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index ba053a68529f..35c633739975 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -2170,25 +2170,11 @@ static int pl011_rs485_config(struct uart_port *port,
struct uart_amba_port *uap =
container_of(port, struct uart_amba_port, port);
- /* pick sane settings if the user hasn't */
- if (!(rs485->flags & SER_RS485_RTS_ON_SEND) ==
- !(rs485->flags & SER_RS485_RTS_AFTER_SEND)) {
- rs485->flags |= SER_RS485_RTS_ON_SEND;
- rs485->flags &= ~SER_RS485_RTS_AFTER_SEND;
- }
- /* clamp the delays to [0, 100ms] */
- rs485->delay_rts_before_send = min(rs485->delay_rts_before_send, 100U);
- rs485->delay_rts_after_send = min(rs485->delay_rts_after_send, 100U);
- memset(rs485->padding, 0, sizeof(rs485->padding));
-
if (port->rs485.flags & SER_RS485_ENABLED)
pl011_rs485_tx_stop(uap);
- /* Set new configuration */
- port->rs485 = *rs485;
-
/* Make sure auto RTS is disabled */
- if (port->rs485.flags & SER_RS485_ENABLED) {
+ if (rs485->flags & SER_RS485_ENABLED) {
u32 cr = pl011_read(uap, REG_CR);
cr &= ~UART011_CR_RTSEN;
--
2.34.1
next prev parent reply other threads:[~2022-02-13 22:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-13 22:27 Move RS485 implementation from drivers to serial core Lino Sanfilippo
2022-02-13 22:27 ` [PATCH 1/9] serial: core: move RS485 configuration tasks from drivers into core Lino Sanfilippo
2022-02-14 5:41 ` Jiri Slaby
2022-02-14 16:13 ` Lino Sanfilippo
2022-02-14 7:06 ` Uwe Kleine-König
2022-02-14 15:09 ` Lino Sanfilippo
2022-02-14 18:23 ` Uwe Kleine-König
2022-02-13 22:27 ` Lino Sanfilippo [this message]
2022-02-13 22:27 ` [PATCH 3/9] serial: stm32: remove redundant code in rs485_config Lino Sanfilippo
2022-02-13 22:27 ` [PATCH 4/9] serial: sc16is7xx: " Lino Sanfilippo
2022-02-13 22:27 ` [PATCH 5/9] serial: omap: " Lino Sanfilippo
2022-02-13 22:27 ` [PATCH 6/9] serial: max310: " Lino Sanfilippo
2022-02-13 22:27 ` [PATCH 7/9] serial: imx: remove redundant assignment " Lino Sanfilippo
2022-02-13 22:27 ` [PATCH 8/9] serial: fsl_lpuart: remove redundant code in rs485_config functions Lino Sanfilippo
2022-02-13 22:27 ` [PATCH 9/9] serial: atmel: remove redundant assignment in rs485_config Lino Sanfilippo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220213222737.15709-3-LinoSanfilippo@gmx.de \
--to=linosanfilippo@gmx.de \
--cc=alexandre.belloni@bootlin.com \
--cc=alexandre.torgue@foss.st.com \
--cc=festevam@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux@armlinux.org.uk \
--cc=ludovic.desroches@microchip.com \
--cc=lukas@wunner.de \
--cc=mcoquelin.stm32@gmail.com \
--cc=nicolas.ferre@microchip.com \
--cc=richard.genoud@gmail.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).