summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2016-02-15 17:38:45 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-07 16:11:14 -0800
commit34eefb595c10eb9a6dc99a82f7333c86dfe61337 (patch)
tree764b4a2c3616ae509a79317751e8768b1e62c4d3 /drivers/tty
parent93d7bbaa65bb54e55f425ab1d5de92ab630857e2 (diff)
downloadlinux-stable-34eefb595c10eb9a6dc99a82f7333c86dfe61337.tar.gz
linux-stable-34eefb595c10eb9a6dc99a82f7333c86dfe61337.tar.bz2
linux-stable-34eefb595c10eb9a6dc99a82f7333c86dfe61337.zip
serial: 8250_dw: remove redundant 'else' keyword
When the main branch contains return statement the 'else' keyword is not needed. Remove it here. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/8250/8250_dw.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index 30810acf7f96..d190d6953281 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -207,9 +207,10 @@ static int dw8250_handle_irq(struct uart_port *p)
struct dw8250_data *d = p->private_data;
unsigned int iir = p->serial_in(p, UART_IIR);
- if (serial8250_handle_irq(p, iir)) {
+ if (serial8250_handle_irq(p, iir))
return 1;
- } else if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
+
+ if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
/* Clear the USR */
(void)p->serial_in(p, d->usr_reg);