diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2016-04-09 20:49:41 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-30 09:26:55 -0700 |
| commit | a86f50ed35a8854f964393e60526c16744e2ed2c (patch) | |
| tree | 0b52dcd75603a330c9b698a3ea52d8c3102f1fc0 | |
| parent | ceeafb8e222f4ea73981ca0bf9f29882cb0c34b2 (diff) | |
| download | blackbird-op-linux-a86f50ed35a8854f964393e60526c16744e2ed2c.tar.gz blackbird-op-linux-a86f50ed35a8854f964393e60526c16744e2ed2c.zip | |
serial: 8250: Eliminate needless local in irq handlers
dma_err is not used other than for boolean evaluation;
substitute the actual operation directly.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/8250/8250_omap.c | 8 | ||||
| -rw-r--r-- | drivers/tty/serial/8250/8250_port.c | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c index 6f760510e46d..7c8c88653374 100644 --- a/drivers/tty/serial/8250/8250_omap.c +++ b/drivers/tty/serial/8250/8250_omap.c @@ -1033,7 +1033,6 @@ static int omap_8250_dma_handle_irq(struct uart_port *port) unsigned char status; unsigned long flags; u8 iir; - int dma_err = 0; serial8250_rpm_get(up); @@ -1048,9 +1047,7 @@ static int omap_8250_dma_handle_irq(struct uart_port *port) status = serial_port_in(port, UART_LSR); if (status & (UART_LSR_DR | UART_LSR_BI)) { - - dma_err = omap_8250_rx_dma(up, iir); - if (dma_err) { + if (omap_8250_rx_dma(up, iir)) { status = serial8250_rx_chars(up, status); omap_8250_rx_dma(up, 0); } @@ -1066,8 +1063,7 @@ static int omap_8250_dma_handle_irq(struct uart_port *port) * try again due to an earlier failer which * might have been resolved by now. */ - dma_err = omap_8250_tx_dma(up); - if (dma_err) + if (omap_8250_tx_dma(up)) serial8250_tx_chars(up); } } diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index a803ddfd5a59..40d2d303dc7f 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -1796,7 +1796,6 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) unsigned char status; unsigned long flags; struct uart_8250_port *up = up_to_u8250p(port); - int dma_err = 0; if (iir & UART_IIR_NO_INT) return 0; @@ -1808,10 +1807,7 @@ int serial8250_handle_irq(struct uart_port *port, unsigned int iir) DEBUG_INTR("status = %x...", status); if (status & (UART_LSR_DR | UART_LSR_BI)) { - if (up->dma) - dma_err = up->dma->rx_dma(up, iir); - - if (!up->dma || dma_err) + if (!up->dma || up->dma->rx_dma(up, iir)) status = serial8250_rx_chars(up, status); } serial8250_modem_status(up); |
