From: Randy Dunlap <rdunlap@infradead.org>
Date: Mon, 26 Nov 2012 19:07:25 +0000 (-0800)
Subject: tty/serial: fix ifx6x60.c declaration warning
X-Git-Tag: v3.8-rc1~177^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc6835a41aea115d97a74d67dc95faa0bbc63d5f;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

tty/serial: fix ifx6x60.c declaration warning

Fix gcc warning of mixed data/code:

drivers/tty/serial/ifx6x60.c:516:2: warning: ISO C90 forbids mixed declarations and code

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Russ Gorby <russ.gorby@intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 2783d96..6356dba 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -510,10 +510,11 @@ static int ifx_spi_write(struct tty_struct *tty, const unsigned char *buf,
 	unsigned char *tmp_buf = (unsigned char *)buf;
 	unsigned long flags;
 	bool is_fifo_empty;
+	int tx_count;
 
 	spin_lock_irqsave(&ifx_dev->fifo_lock, flags);
 	is_fifo_empty = kfifo_is_empty(&ifx_dev->tx_fifo);
-	int tx_count = kfifo_in(&ifx_dev->tx_fifo, tmp_buf, count);
+	tx_count = kfifo_in(&ifx_dev->tx_fifo, tmp_buf, count);
 	spin_unlock_irqrestore(&ifx_dev->fifo_lock, flags);
 	if (is_fifo_empty)
 		mrdy_assert(ifx_dev);