aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-09-05 01:00:11 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-05 16:18:13 -0400
commit9303ac158fcd5f69c032e06391a9a12d3ccb343e (patch)
tree9e818c85e36b7a9a8748d7466fabdecf48da8b3b
parentd20925e1e4fbd501754efad5401040d700fae4d6 (diff)
serial: Samsung: Silence some checkpatch errors and warnings
Fixes the following errors and warnings: ERROR: trailing whitespace ERROR: return is not a function, parentheses are not required WARNING: suspect code indent for conditional statements (32, 36) Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/samsung.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 8749a07dbea4..bdaa06f3ab69 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -82,7 +82,7 @@ static inline const char *s3c24xx_serial_portname(struct uart_port *port)
82 82
83static int s3c24xx_serial_txempty_nofifo(struct uart_port *port) 83static int s3c24xx_serial_txempty_nofifo(struct uart_port *port)
84{ 84{
85 return (rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE); 85 return rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE;
86} 86}
87 87
88/* 88/*
@@ -268,7 +268,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
268 dbg("break!\n"); 268 dbg("break!\n");
269 port->icount.brk++; 269 port->icount.brk++;
270 if (uart_handle_break(port)) 270 if (uart_handle_break(port))
271 goto ignore_char; 271 goto ignore_char;
272 } 272 }
273 273
274 if (uerstat & S3C2410_UERSTAT_FRAME) 274 if (uerstat & S3C2410_UERSTAT_FRAME)
@@ -1129,7 +1129,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
1129 ourport->rx_irq = ret; 1129 ourport->rx_irq = ret;
1130 ourport->tx_irq = ret + 1; 1130 ourport->tx_irq = ret + 1;
1131 } 1131 }
1132 1132
1133 ret = platform_get_irq(platdev, 1); 1133 ret = platform_get_irq(platdev, 1);
1134 if (ret > 0) 1134 if (ret > 0)
1135 ourport->tx_irq = ret; 1135 ourport->tx_irq = ret;