2022-04-12 20:59:39

by Jiri Slaby

Subject: [PATCH 0/3] tty: various cleanups

This is another couple of tty cleanup patches for 5.19. See the
respective patches.

Jiri Slaby (3):
tty: serial: mpc52xx_uart: remove double ifdeffery
tty: serial: owl-uart, send x_char even if stopped
tty: serial: altera: use altera_jtaguart_stop_tx()

drivers/tty/serial/altera_jtaguart.c | 6 ++----
drivers/tty/serial/mpc52xx_uart.c | 3 ---
drivers/tty/serial/owl-uart.c | 6 +++---
3 files changed, 5 insertions(+), 10 deletions(-)

--
2.35.1

2022-04-13 00:10:25

by Jiri Slaby

Subject: [PATCH 1/3] tty: serial: mpc52xx_uart: remove double ifdeffery

The code now contains:
#ifdef CONFIG_PPC_MPC512x
...
#endif

#ifdef CONFIG_PPC_MPC512x
...
#endif

So remove the endif+ifdef from the middle, provided it's about the same
define.

Signed-off-by: Jiri Slaby <[email protected]>
---
drivers/tty/serial/mpc52xx_uart.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
index 3acc0f185762..c4b590dd6f23 100644
--- a/drivers/tty/serial/mpc52xx_uart.c
+++ b/drivers/tty/serial/mpc52xx_uart.c
@@ -754,9 +754,6 @@ static void mpc512x_psc_get_irq(struct uart_port *port, struct device_node *np)
port->irqflags = IRQF_SHARED;
port->irq = psc_fifoc_irq;
}
-#endif
-
-#ifdef CONFIG_PPC_MPC512x

#define PSC_5125(port) ((struct mpc5125_psc __iomem *)((port)->membase))
#define FIFO_5125(port) ((struct mpc512x_psc_fifo __iomem *)(PSC_5125(port)+1))
--
2.35.1