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.

Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20210519092541.10137-1-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 78682c12156a662c68a69145d0e00d5a81175f77..e14f3378b8a0e65bd33a2cf635c72aec1ed33766 100644 (file)
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -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;

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 7d5a8dfa3e91e28d2e2ee6debf1f51f7b52e8712..4b838601cdce5f3e45c569afaed2eb0eef0e5a94 100644 (file)
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -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)

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 84e8158088cd2fd8410b7a16ae4b5868270f6e7d..9e81b09ba08e5a77f6b8c7f5568cfa4f4c3f8ae5 100644 (file)
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -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) {

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index d29329eb52f4d59b45a42deb165e6f9a2316397f..2793b1cf2d24fcbc77f212996c97672f2e292fcc 100644 (file)
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -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;
 
        /*

diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c
index e7048515a79ca9766ef87e5b80574c36f401e020..f092c11f9d7d08e1b07c39ca0fe3e18d42bb1383 100644 (file)
--- a/drivers/tty/serial/st-asc.c
+++ b/drivers/tty/serial/st-asc.c
@@ -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) {

diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c
index c2ae7b392b86b4761085beaf0e197b73f7d43d79..bf188bdf971760334795a9c5f7b0031bd1cc1027 100644 (file)
--- a/drivers/tty/serial/stm32-usart.c
+++ b/drivers/tty/serial/stm32-usart.c
@@ -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:

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 67a2db621e2b7669e007bdc7e3d4ab0731b7c9d2..9bca52ffd84dbcaa4133276f630216a552a89d6f 100644 (file)
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -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;