From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Slaby Subject: Re: [PATCH] serial: bcm63xx_uart: fix compilation after "TTY: switch tty_insert_flip_char" Date: Thu, 28 Feb 2013 20:53:31 +0100 Message-ID: <512FB5BB.4060905@suse.cz> References: <1361711319-15825-1-git-send-email-jogo@openwrt.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-2 Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f47.google.com ([74.125.83.47]:32782 "EHLO mail-ee0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752755Ab3B1Txf (ORCPT ); Thu, 28 Feb 2013 14:53:35 -0500 Received: by mail-ee0-f47.google.com with SMTP id e52so1784659eek.34 for ; Thu, 28 Feb 2013 11:53:34 -0800 (PST) In-Reply-To: <1361711319-15825-1-git-send-email-jogo@openwrt.org> Sender: linux-serial-owner@vger.kernel.org List-Id: linux-serial@vger.kernel.org To: Jonas Gorski , linux-serial@vger.kernel.org Cc: Greg Kroah-Hartman , Maxime Bizon , Florian Fainelli , Kevin Cernekee On 02/24/2013 02:08 PM, Jonas Gorski wrote: > 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. > > Signed-off-by: Jonas Gorski 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. > --- > 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(-) > > diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c > index 719594e..52a3ecd 100644 > --- a/drivers/tty/serial/bcm63xx_uart.c > +++ b/drivers/tty/serial/bcm63xx_uart.c > @@ -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); > } > > /* > -- js suse labs