mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
tty: serial: fsl_lpuart: Simplify RX/TX IRQ handlers
It appears that lpuart_rxint, lpuart_txint and lpuart32_rxint were modelled after identical function found in UART driver for i.MX. However, while said functions are used as individual IRQ handlers in i.MX driver (in case of i.MX1), it is not the case for LPUART. Given that, there's no need for us to restrict the prototype of the handler to irqreturn_t foo(int, void *) and we can drop all of uneened boilerplate code by changing it void foo(struct lpuart_port *). Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Cc: Stefan Agner <stefan@agner.ch> Cc: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com> Cc: Chris Healy <cphealy@gmail.com> Cc: Cory Tusar <cory.tusar@zii.aero> Cc: Lucas Stach <l.stach@pengutronix.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jiri Slaby <jslaby@suse.com> Cc: linux-imx@nxp.com Cc: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org Link: https://lore.kernel.org/r/20190729195226.8862-5-andrew.smirnov@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
9bc19af9da
commit
3993ddc236
1 changed files with 7 additions and 13 deletions
|
@ -771,9 +771,8 @@ static unsigned int lpuart32_tx_empty(struct uart_port *port)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static irqreturn_t lpuart_txint(int irq, void *dev_id)
|
||||
static void lpuart_txint(struct lpuart_port *sport)
|
||||
{
|
||||
struct lpuart_port *sport = dev_id;
|
||||
struct circ_buf *xmit = &sport->port.state->xmit;
|
||||
unsigned long flags;
|
||||
|
||||
|
@ -804,12 +803,10 @@ static irqreturn_t lpuart_txint(int irq, void *dev_id)
|
|||
|
||||
out:
|
||||
spin_unlock_irqrestore(&sport->port.lock, flags);
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static irqreturn_t lpuart_rxint(int irq, void *dev_id)
|
||||
static void lpuart_rxint(struct lpuart_port *sport)
|
||||
{
|
||||
struct lpuart_port *sport = dev_id;
|
||||
unsigned int flg, ignored = 0, overrun = 0;
|
||||
struct tty_port *port = &sport->port.state->port;
|
||||
unsigned long flags;
|
||||
|
@ -878,12 +875,10 @@ static irqreturn_t lpuart_rxint(int irq, void *dev_id)
|
|||
spin_unlock_irqrestore(&sport->port.lock, flags);
|
||||
|
||||
tty_flip_buffer_push(port);
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static irqreturn_t lpuart32_rxint(int irq, void *dev_id)
|
||||
static void lpuart32_rxint(struct lpuart_port *sport)
|
||||
{
|
||||
struct lpuart_port *sport = dev_id;
|
||||
unsigned int flg, ignored = 0;
|
||||
struct tty_port *port = &sport->port.state->port;
|
||||
unsigned long flags;
|
||||
|
@ -942,7 +937,6 @@ static irqreturn_t lpuart32_rxint(int irq, void *dev_id)
|
|||
spin_unlock_irqrestore(&sport->port.lock, flags);
|
||||
|
||||
tty_flip_buffer_push(port);
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static irqreturn_t lpuart_int(int irq, void *dev_id)
|
||||
|
@ -953,10 +947,10 @@ static irqreturn_t lpuart_int(int irq, void *dev_id)
|
|||
sts = readb(sport->port.membase + UARTSR1);
|
||||
|
||||
if (sts & UARTSR1_RDRF)
|
||||
lpuart_rxint(irq, dev_id);
|
||||
lpuart_rxint(sport);
|
||||
|
||||
if (sts & UARTSR1_TDRE)
|
||||
lpuart_txint(irq, dev_id);
|
||||
lpuart_txint(sport);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
@ -971,10 +965,10 @@ static irqreturn_t lpuart32_int(int irq, void *dev_id)
|
|||
rxcount = rxcount >> UARTWATER_RXCNT_OFF;
|
||||
|
||||
if ((sts & UARTSTAT_RDRF || rxcount > 0) && !sport->lpuart_dma_rx_use)
|
||||
lpuart32_rxint(irq, dev_id);
|
||||
lpuart32_rxint(sport);
|
||||
|
||||
if ((sts & UARTSTAT_TDRE) && !sport->lpuart_dma_tx_use)
|
||||
lpuart_txint(irq, dev_id);
|
||||
lpuart_txint(sport);
|
||||
|
||||
lpuart32_write(&sport->port, sts, UARTSTAT);
|
||||
return IRQ_HANDLED;
|
||||
|
|
Loading…
Reference in a new issue