diff options
author | Randy Dunlap <rdunlap@infradead.org> | 2012-11-26 14:07:25 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 18:36:39 -0500 |
commit | bc6835a41aea115d97a74d67dc95faa0bbc63d5f (patch) | |
tree | 63e6811cf339fa68c3a8bc1800a3da12d411d703 /drivers/tty | |
parent | 666ca0b9b706ca3ee11f7bcba1f845a127937b41 (diff) |
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>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/ifx6x60.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c index 2783d96ff610..6356dba49e6c 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, | |||
510 | unsigned char *tmp_buf = (unsigned char *)buf; | 510 | unsigned char *tmp_buf = (unsigned char *)buf; |
511 | unsigned long flags; | 511 | unsigned long flags; |
512 | bool is_fifo_empty; | 512 | bool is_fifo_empty; |
513 | int tx_count; | ||
513 | 514 | ||
514 | spin_lock_irqsave(&ifx_dev->fifo_lock, flags); | 515 | spin_lock_irqsave(&ifx_dev->fifo_lock, flags); |
515 | is_fifo_empty = kfifo_is_empty(&ifx_dev->tx_fifo); | 516 | is_fifo_empty = kfifo_is_empty(&ifx_dev->tx_fifo); |
516 | int tx_count = kfifo_in(&ifx_dev->tx_fifo, tmp_buf, count); | 517 | tx_count = kfifo_in(&ifx_dev->tx_fifo, tmp_buf, count); |
517 | spin_unlock_irqrestore(&ifx_dev->fifo_lock, flags); | 518 | spin_unlock_irqrestore(&ifx_dev->fifo_lock, flags); |
518 | if (is_fifo_empty) | 519 | if (is_fifo_empty) |
519 | mrdy_assert(ifx_dev); | 520 | mrdy_assert(ifx_dev); |