serial: drop irq-flags initialisations

PATCH In review Johan Hovold 2 participants 2 messages May 19, 2021

Subsystems (6)

Arm i.MX and Layerscape TTY layer and serial drivers Arm STM32 Arm/Zynq architecture +2 more subsystems

lore

Share & tools

lore

Johan Hovold

author

2021-05-19 09:25 UTC #0 lore raw

PATCH 1/1 serial: drop irq-flags initialisations

There's no need to initialise irq-flags variables before saving the interrupt state.

Drop the redundant initialisations from drivers that got this wrong.

Signed-off-by Johan Hovold <[email protected]>

---
 drivers/tty/serial/amba-pl011.c    |  2 +-
 drivers/tty/serial/imx.c           |  2 +-
 drivers/tty/serial/omap-serial.c   | 10 +++++-----
 drivers/tty/serial/serial_core.c   |  4 ++--
 drivers/tty/serial/st-asc.c        |  2 +-
 drivers/tty/serial/stm32-usart.c   |  2 +-
 drivers/tty/serial/xilinx_uartps.c |  8 ++++----
 7 files changed, 15 insertions(+), 15 deletions(-)

drivers/tty/serial/amba-pl011.c +1 -1

index 78682c12156a..e14f3378b8a0 100644
@@ -1062,7 +1062,7 @@ static void pl011_dma_rx_poll(struct timer_list *t)
 	struct tty_port *port = &uap->port.state->port;
 	struct pl011_dmarx_data *dmarx = &uap->dmarx;
 	struct dma_chan *rxchan = uap->dmarx.chan;
-	unsigned long flags = 0;
+	unsigned long flags;
 	unsigned int dmataken = 0;
 	unsigned int size = 0;
 	struct pl011_sgbuf *sgbuf;

drivers/tty/serial/imx.c +1 -1

index 7d5a8dfa3e91..4b838601cdce 100644
@@ -1975,8 +1975,8 @@ imx_uart_console_write(struct console *co, const char *s, unsigned int count)
 {
 	struct imx_port *sport = imx_uart_ports[co->index];
 	struct imx_port_ucrs old_ucr;
+	unsigned long flags;
 	unsigned int ucr1;
-	unsigned long flags = 0;
 	int locked = 1;
 
 	if (sport->port.sysrq)

drivers/tty/serial/omap-serial.c +5 -5

index 84e8158088cd..9e81b09ba08e 100644
@@ -626,7 +626,7 @@ static irqreturn_t serial_omap_irq(int irq, void *dev_id)
 static unsigned int serial_omap_tx_empty(struct uart_port *port)
 {
 	struct uart_omap_port *up = to_uart_omap_port(port);
-	unsigned long flags = 0;
+	unsigned long flags;
 	unsigned int ret = 0;
 
 	pm_runtime_get_sync(up->dev);

@@ -704,7 +704,7 @@ static void serial_omap_set_mctrl(struct uart_port *port, unsigned int mctrl)
 static void serial_omap_break_ctl(struct uart_port *port, int break_state)
 {
 	struct uart_omap_port *up = to_uart_omap_port(port);
-	unsigned long flags = 0;
+	unsigned long flags;
 
 	dev_dbg(up->port.dev, "serial_omap_break_ctl+%d\n", up->port.line);
 	pm_runtime_get_sync(up->dev);

@@ -722,7 +722,7 @@ static void serial_omap_break_ctl(struct uart_port *port, int break_state)
 static int serial_omap_startup(struct uart_port *port)
 {
 	struct uart_omap_port *up = to_uart_omap_port(port);
-	unsigned long flags = 0;
+	unsigned long flags;
 	int retval;
 
 	/*

@@ -797,7 +797,7 @@ static int serial_omap_startup(struct uart_port *port)
 static void serial_omap_shutdown(struct uart_port *port)
 {
 	struct uart_omap_port *up = to_uart_omap_port(port);
-	unsigned long flags = 0;
+	unsigned long flags;
 
 	dev_dbg(up->port.dev, "serial_omap_shutdown+%d\n", up->port.line);

@@ -845,7 +845,7 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
 {
 	struct uart_omap_port *up = to_uart_omap_port(port);
 	unsigned char cval = 0;
-	unsigned long flags = 0;
+	unsigned long flags;
 	unsigned int baud, quot;
 
 	switch (termios->c_cflag & CSIZE) {

drivers/tty/serial/serial_core.c +2 -2

index 87f7127b57e6..a28b51519bff 100644
@@ -184,8 +184,8 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,
 		int init_hw)
 {
 	struct uart_port *uport = uart_port_check(state);
+	unsigned long flags;
 	unsigned long page;
-	unsigned long flags = 0;
 	int retval = 0;
 
 	if (uport->type == PORT_UNKNOWN)

@@ -275,7 +275,7 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)
 {
 	struct uart_port *uport = uart_port_check(state);
 	struct tty_port *port = &state->port;
-	unsigned long flags = 0;
+	unsigned long flags;
 	char *xmit_buf = NULL;
 
 	/*

drivers/tty/serial/st-asc.c +1 -1

index e7048515a79c..f092c11f9d7d 100644
@@ -478,7 +478,7 @@ static void asc_pm(struct uart_port *port, unsigned int state,
 		unsigned int oldstate)
 {
 	struct asc_port *ascport = to_asc_port(port);
-	unsigned long flags = 0;
+	unsigned long flags;
 	u32 ctl;
 
 	switch (state) {

drivers/tty/serial/stm32-usart.c +1 -1

index c2ae7b392b86..bf188bdf9717 100644
@@ -980,7 +980,7 @@ static void stm32_usart_pm(struct uart_port *port, unsigned int state,
 			struct stm32_port, port);
 	const struct stm32_usart_offsets *ofs = &stm32port->info->ofs;
 	const struct stm32_usart_config *cfg = &stm32port->info->cfg;
-	unsigned long flags = 0;
+	unsigned long flags;
 
 	switch (state) {
 	case UART_PM_STATE_ON:

drivers/tty/serial/xilinx_uartps.c +4 -4

index 67a2db621e2b..9bca52ffd84d 100644
@@ -497,8 +497,8 @@ static int cdns_uart_clk_notifier_cb(struct notifier_block *nb,
 	struct uart_port *port;
 	int locked = 0;
 	struct clk_notifier_data *ndata = data;
-	unsigned long flags = 0;
 	struct cdns_uart *cdns_uart = to_cdns_uart(nb);
+	unsigned long flags;
 
 	port = cdns_uart->port;
 	if (port->suspended)

@@ -1210,7 +1210,7 @@ static void cdns_uart_console_write(struct console *co, const char *s,
 				unsigned int count)
 {
 	struct uart_port *port = console_port;
-	unsigned long flags = 0;
+	unsigned long flags;
 	unsigned int imr, ctrl;
 	int locked = 1;

@@ -1308,7 +1308,7 @@ static int cdns_uart_suspend(struct device *device)
 	may_wake = device_may_wakeup(device);
 
 	if (console_suspend_enabled && uart_console(port) && may_wake) {
-		unsigned long flags = 0;
+		unsigned long flags;
 
 		spin_lock_irqsave(&port->lock, flags);
 		/* Empty the receive FIFO 1st before making changes */

@@ -1339,7 +1339,7 @@ static int cdns_uart_resume(struct device *device)
 {
 	struct uart_port *port = dev_get_drvdata(device);
 	struct cdns_uart *cdns_uart = port->private_data;
-	unsigned long flags = 0;
+	unsigned long flags;
 	u32 ctrl_reg;
 	int may_wake;

Signature · 1 line

2.26.3

Uwe Kleine-König

Acked-by on v1 1/1

2021-05-19 09:46 UTC #1 lore raw

Quoted 34 lines · Johan Hovold

There's no need to initialise irq-flags variables before saving the interrupt state.

Drop the redundant initialisations from drivers that got this wrong.

Signed-off-by Johan Hovold <[email protected]>

---
 drivers/tty/serial/amba-pl011.c    |  2 +-
 drivers/tty/serial/imx.c           |  2 +-
 drivers/tty/serial/omap-serial.c   | 10 +++++-----
 drivers/tty/serial/serial_core.c   |  4 ++--
 drivers/tty/serial/st-asc.c        |  2 +-
 drivers/tty/serial/stm32-usart.c   |  2 +-
 drivers/tty/serial/xilinx_uartps.c |  8 ++++----
 7 files changed, 15 insertions(+), 15 deletions(-)

drivers/tty/serial/amba-pl011.c +1 -1

index 78682c12156a..e14f3378b8a0 100644
@@ -1062,7 +1062,7 @@ static void pl011_dma_rx_poll(struct timer_list *t)
 	struct tty_port *port = &uap->port.state->port;
 	struct pl011_dmarx_data *dmarx = &uap->dmarx;
 	struct dma_chan *rxchan = uap->dmarx.chan;
-	unsigned long flags = 0;
+	unsigned long flags;
 	unsigned int dmataken = 0;
 	unsigned int size = 0;
 	struct pl011_sgbuf *sgbuf;

drivers/tty/serial/imx.c +0 -0

index 7d5a8dfa3e91..4b838601cdce 100644

drivers/tty/serial/imx.c imx_uart_console_write(struct console *co, const char *s, unsigned int count) · line 1982

Quoted 9 lines

drivers/tty/serial/imx.c +1 -1

@@ -1975,8 +1975,8 @@ imx_uart_console_write(struct console *co, const char *s, unsigned int count)
 {
 	struct imx_port *sport = imx_uart_ports[co->index];
 	struct imx_port_ucrs old_ucr;
+	unsigned long flags;
 	unsigned int ucr1;
-	unsigned long flags = 0;
 	int locked = 1;
 
 	if (sport->port.sysrq)

Apart from changing the order here being unnecessary, the patch looks right. Ditto for serial_core.c and xilinx_uartps.c.
I don't care much though, so

Acked-by Uwe Kleine-König <[email protected]>

Best regards
Uwe

Signature · 2 lines

Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |