aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/sh-sci.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-03-01 21:53:54 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-03-01 21:53:54 -0500
commitc6efd46b98f30863ca3a9982312db87b826cf715 (patch)
tree289ee0e95d203be5f6c3e2330b6cb998394e0065 /drivers/serial/sh-sci.c
parent7d0b0a4434dd97d8e0731241aee586460f7fb7bd (diff)
serial: sh-sci: Tidy up build warnings.
The recent sh-sci DMA support introduces a number of trivial build warnings, clean them up. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/serial/sh-sci.c')
-rw-r--r--drivers/serial/sh-sci.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index f3841cd8fc5d..980f39449ee5 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -685,7 +685,7 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)
685 /* Calculate delay for 1.5 DMA buffers */ 685 /* Calculate delay for 1.5 DMA buffers */
686 tout = (port->timeout - HZ / 50) * s->buf_len_rx * 3 / 686 tout = (port->timeout - HZ / 50) * s->buf_len_rx * 3 /
687 port->fifosize / 2; 687 port->fifosize / 2;
688 dev_dbg(port->dev, "Rx IRQ: setup timeout in %u ms\n", 688 dev_dbg(port->dev, "Rx IRQ: setup timeout in %lu ms\n",
689 tout * 1000 / HZ); 689 tout * 1000 / HZ);
690 if (tout < 2) 690 if (tout < 2)
691 tout = 2; 691 tout = 2;
@@ -999,7 +999,6 @@ static void sci_rx_dma_release(struct sci_port *s, bool enable_pio)
999{ 999{
1000 struct dma_chan *chan = s->chan_rx; 1000 struct dma_chan *chan = s->chan_rx;
1001 struct uart_port *port = &s->port; 1001 struct uart_port *port = &s->port;
1002 unsigned long flags;
1003 1002
1004 s->chan_rx = NULL; 1003 s->chan_rx = NULL;
1005 s->cookie_rx[0] = s->cookie_rx[1] = -EINVAL; 1004 s->cookie_rx[0] = s->cookie_rx[1] = -EINVAL;
@@ -1014,7 +1013,6 @@ static void sci_tx_dma_release(struct sci_port *s, bool enable_pio)
1014{ 1013{
1015 struct dma_chan *chan = s->chan_tx; 1014 struct dma_chan *chan = s->chan_tx;
1016 struct uart_port *port = &s->port; 1015 struct uart_port *port = &s->port;
1017 unsigned long flags;
1018 1016
1019 s->chan_tx = NULL; 1017 s->chan_tx = NULL;
1020 s->cookie_tx = -EINVAL; 1018 s->cookie_tx = -EINVAL;