serial: bcm63xx_uart: fix compilation after "TTY: switch tty_insert_flip_char"
PATCH 1/1 serial: bcm63xx_uart: fix compilation after "TTY: switch tty_insert_flip_char"
92a19f9cec9a80ad93c06e115822deb729e2c6ad introduced a local variable with the same name as the argument to bcm_uart_do_rx, breaking compilation. Fix this by renaming the new variable and its uses where expected.
---
Based on git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
drivers/tty/serial/bcm63xx_uart.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/tty/serial/bcm63xx_uart.c +4 -4
@@ -235,7 +235,7 @@ static const char *bcm_uart_type(struct uart_port *port)*/ static void bcm_uart_do_rx (struct uart_port *port) { -struct tty_port *port = &port->state->port; +struct tty_port *tty_port = &port->state->port;unsigned int max_count;/* limit number of char read in interrupt, should not be
@@ -260,7 +260,7 @@ static void bcm_uart_do_rx(struct uart_port *port)bcm_uart_writel (port, val,UART_CTL_REG ); port->icount.overrun++; -tty_insert_flip_char (port,0 ,TTY_OVERRUN ); +tty_insert_flip_char (tty_port,0 ,TTY_OVERRUN ); }if (!(iestat &UART_IR_STAT (UART_IR_RXNOTEMPTY )))
@@ -299,11 +299,11 @@ static void bcm_uart_do_rx(struct uart_port *port)if ((cstat & port->ignore_status_mask) ==0 ) -tty_insert_flip_char (port, c, flag); +tty_insert_flip_char (tty_port, c, flag); }while (--max_count); -tty_flip_buffer_push (port); +tty_flip_buffer_push (tty_port); }/*
Signature · 1 line
1.7.10.4
Quoted 6 lines · Jonas Gorski
92a19f9cec9a80ad93c06e115822deb729e2c6adintroduced a local variable with the same name as the argument tobcm_uart_do_rx, breaking compilation. Fix this by renaming the new variable and its uses where expected.Signed-off-by Jonas Gorski <[email protected]>
Ok, I missed that one. Added this to my tty-build script now:
make O=../a/cross/mips-bcm63xx/ ARCH=mips CROSS_COMPILE=mips-linux- -j5 drivers/tty/serial/bcm63xx_uart.o
Thanks for fixing.
Quoted 43 lines
---
Based ongit://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.gitdrivers/tty/serial/bcm63xx_uart.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/tty/serial/bcm63xx_uart.c +4
-4@@ -235,7 +235,7 @@ static const char *bcm_uart_type(struct uart_port *port)*/ static void bcm_uart_do_rx (struct uart_port *port) { -struct tty_port *port = &port->state->port; +struct tty_port *tty_port = &port->state->port;unsigned int max_count;/* limit number of char read in interrupt, should not be @@ -260,7 +260,7 @@ static void bcm_uart_do_rx(struct uart_port *port)bcm_uart_writel (port, val,UART_CTL_REG ); port->icount.overrun++; -tty_insert_flip_char (port,0 ,TTY_OVERRUN ); +tty_insert_flip_char (tty_port,0 ,TTY_OVERRUN ); }if (!(iestat &UART_IR_STAT (UART_IR_RXNOTEMPTY )))@@ -299,11 +299,11 @@ static void bcm_uart_do_rx(struct uart_port *port)if ((cstat & port->ignore_status_mask) ==0 ) -tty_insert_flip_char (port, c, flag); +tty_insert_flip_char (tty_port, c, flag); }while (--max_count); -tty_flip_buffer_push (port); +tty_flip_buffer_push (tty_port); }/*
Signature · 2 lines
js suse labs