@@ -888,10 +888,9 @@ static void imx_uart_check_flood(struct imx_port *sport, u32 usr2)
static irqreturn_t __imx_uart_rxint(int irq, void *dev_id)
{
struct imx_port *sport = dev_id;
- unsigned int rx, flg;
struct tty_port *port = &sport->port.state->port;
typeof(sport->port.membase) membase = sport->port.membase;
- u32 usr2;
+ u32 usr2, rx;
/* If we received something, check for 0xff flood */
usr2 = readl(membase + USR2);
@@ -899,7 +898,7 @@ static irqreturn_t __imx_uart_rxint(int irq, void *dev_id)
imx_uart_check_flood(sport, usr2);
while ((rx = readl(membase + URXD0)) & URXD_CHARRDY) {
- flg = TTY_NORMAL;
+ unsigned int flg = TTY_NORMAL;
sport->port.icount.rx++;
if (unlikely(rx & URXD_ERR)) {
The 'rx' is chip register, similar to 'usr2', so let it be of 'u32' type as well. Move 'flg' to be FIFO read loop local as it's not used outside. Signed-off-by: Sergey Organov <sorganov@gmail.com> --- drivers/tty/serial/imx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)