summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-03-02 03:53:54 +0100
committerPaul Mundt <lethal@linux-sh.org>2010-03-02 03:53:54 +0100
commitc6efd46b98f30863ca3a9982312db87b826cf715 (patch)
tree289ee0e95d203be5f6c3e2330b6cb998394e0065
parentsh: Fix up ctrl_read/write stragglers in migor setup. (diff)
downloadlinux-c6efd46b98f30863ca3a9982312db87b826cf715.tar.xz
linux-c6efd46b98f30863ca3a9982312db87b826cf715.zip
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>
-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)
/* Calculate delay for 1.5 DMA buffers */
tout = (port->timeout - HZ / 50) * s->buf_len_rx * 3 /
port->fifosize / 2;
- dev_dbg(port->dev, "Rx IRQ: setup timeout in %u ms\n",
+ dev_dbg(port->dev, "Rx IRQ: setup timeout in %lu ms\n",
tout * 1000 / HZ);
if (tout < 2)
tout = 2;
@@ -999,7 +999,6 @@ static void sci_rx_dma_release(struct sci_port *s, bool enable_pio)
{
struct dma_chan *chan = s->chan_rx;
struct uart_port *port = &s->port;
- unsigned long flags;
s->chan_rx = NULL;
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)
{
struct dma_chan *chan = s->chan_tx;
struct uart_port *port = &s->port;
- unsigned long flags;
s->chan_tx = NULL;
s->cookie_tx = -EINVAL;