serial: lpc32xx: Fix fallout from tty_port conversion

A duplicate definition of the port variable was introduced in the
interrupt handler, which causes the build to break. The fix is to
rename the variable to tport, which is already properly used in
subsequent code.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/lpc32xx_hs.c b/drivers/tty/serial/lpc32xx_hs.c
index c01b58f3729c2666127f7971ab6202e745335450..dffea6b2cd7d206314fe6a69ecd0cecc7cce7d56 100644 (file)
--- a/drivers/tty/serial/lpc32xx_hs.c
+++ b/drivers/tty/serial/lpc32xx_hs.c
@@ -322,7 +322,7 @@ exit_tx:
 static irqreturn_t serial_lpc32xx_interrupt(int irq, void *dev_id)
 {
        struct uart_port *port = dev_id;
-       struct tty_port *port = &port->state->port;
+       struct tty_port *tport = &port->state->port;
        u32 status;
 
        spin_lock(&port->lock);