Commit 18ee37e1 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20210519092541.10137-1-johan@kernel.org


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

drivers/tty/serial/amba-pl011.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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) {