hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

serial: sh-sci: Neaten dev_<level> uses 

Add missing newlines and coalesce formats.
Realign arguments.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Joe Perches 2014-03-11 10:10:46 -07:00 committed by Greg Kroah-Hartman
parent d3dfe5d9b4
commit 9b971cd206
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/tty/serial/sh-sci.c
View File

@ -788,7 +788,7 @@ static int sci_handle_errors(struct uart_port *port)
if (tty_insert_flip_char(tport, 0, TTY_OVERRUN)) if (tty_insert_flip_char(tport, 0, TTY_OVERRUN))
copied++; copied++;
dev_notice(port->dev, "overrun error"); dev_notice(port->dev, "overrun error\n");
} }
if (status & SCxSR_FER(port)) { if (status & SCxSR_FER(port)) {
@ -830,7 +830,7 @@ static int sci_handle_errors(struct uart_port *port)
if (tty_insert_flip_char(tport, 0, TTY_PARITY)) if (tty_insert_flip_char(tport, 0, TTY_PARITY))
copied++; copied++;
dev_notice(port->dev, "parity error"); dev_notice(port->dev, "parity error\n");
} }
if (copied) if (copied)
@ -1292,7 +1292,8 @@ static void sci_dma_rx_complete(void *arg)
unsigned long flags; unsigned long flags;
int count; int count;
dev_dbg(port->dev, "%s(%d) active #%d\n", __func__, port->line, s->active_rx); dev_dbg(port->dev, "%s(%d) active #%d\n",
__func__, port->line, s->active_rx);
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
@ -1368,8 +1369,8 @@ static void sci_submit_rx(struct sci_port *s)
sci_rx_dma_release(s, true); sci_rx_dma_release(s, true);
return; return;
} }
dev_dbg(s->port.dev, "%s(): cookie %d to #%d\n", __func__, dev_dbg(s->port.dev, "%s(): cookie %d to #%d\n",
s->cookie_rx[i], i); __func__, s->cookie_rx[i], i);
} }
s->active_rx = s->cookie_rx[0]; s->active_rx = s->cookie_rx[0];
@ -1428,8 +1429,8 @@ static void work_fn_rx(struct work_struct *work)
s->active_rx = s->cookie_rx[!new]; s->active_rx = s->cookie_rx[!new];
dev_dbg(port->dev, "%s: cookie %d #%d, new active #%d\n", __func__, dev_dbg(port->dev, "%s: cookie %d #%d, new active #%d\n",
s->cookie_rx[new], new, s->active_rx); __func__, s->cookie_rx[new], new, s->active_rx);
} }
static void work_fn_tx(struct work_struct *work) static void work_fn_tx(struct work_struct *work)
@ -1482,8 +1483,8 @@ static void work_fn_tx(struct work_struct *work)
return; return;
} }
dev_dbg(port->dev, "%s: %p: %d...%d, cookie %d\n", __func__, dev_dbg(port->dev, "%s: %p: %d...%d, cookie %d\n",
xmit->buf, xmit->tail, xmit->head, s->cookie_tx); __func__, xmit->buf, xmit->tail, xmit->head, s->cookie_tx);
dma_async_issue_pending(chan); dma_async_issue_pending(chan);
} }
@ -1602,8 +1603,8 @@ static bool filter(struct dma_chan *chan, void *slave)
{ {
struct sh_dmae_slave *param = slave; struct sh_dmae_slave *param = slave;
dev_dbg(chan->device->dev, "%s: slave ID %d\n", __func__, dev_dbg(chan->device->dev, "%s: slave ID %d\n",
param->shdma_slave.slave_id); __func__, param->shdma_slave.slave_id);
chan->private = &param->shdma_slave; chan->private = &param->shdma_slave;
return true; return true;
@ -1632,8 +1633,7 @@ static void sci_request_dma(struct uart_port *port)
dma_cap_mask_t mask; dma_cap_mask_t mask;
int nent; int nent;
dev_dbg(port->dev, "%s: port %d\n", __func__, dev_dbg(port->dev, "%s: port %d\n", __func__, port->line);
port->line);
if (s->cfg->dma_slave_tx <= 0 || s->cfg->dma_slave_rx <= 0) if (s->cfg->dma_slave_tx <= 0 || s->cfg->dma_slave_rx <= 0)
return; return;
@ -1661,7 +1661,8 @@ static void sci_request_dma(struct uart_port *port)
if (!nent) if (!nent)
sci_tx_dma_release(s, false); sci_tx_dma_release(s, false);
else else
dev_dbg(port->dev, "%s: mapped %d@%p to %pad\n", __func__, dev_dbg(port->dev, "%s: mapped %d@%p to %pad\n",
__func__,
sg_dma_len(&s->sg_tx), port->state->xmit.buf, sg_dma_len(&s->sg_tx), port->state->xmit.buf,
&sg_dma_address(&s->sg_tx)); &sg_dma_address(&s->sg_tx));
@ -1935,8 +1936,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
if (s->chan_rx) { if (s->chan_rx) {
s->rx_timeout = (port->timeout - HZ / 50) * s->buf_len_rx * 3 / s->rx_timeout = (port->timeout - HZ / 50) * s->buf_len_rx * 3 /
port->fifosize / 2; port->fifosize / 2;
dev_dbg(port->dev, dev_dbg(port->dev, "DMA Rx t-out %ums, tty t-out %u jiffies\n",
"DMA Rx t-out %ums, tty t-out %u jiffies\n",
s->rx_timeout * 1000 / HZ, port->timeout); s->rx_timeout * 1000 / HZ, port->timeout);
if (s->rx_timeout < msecs_to_jiffies(20)) if (s->rx_timeout < msecs_to_jiffies(20))
s->rx_timeout = msecs_to_jiffies(20); s->rx_timeout = msecs_to_jiffies(20);
@ -2503,11 +2503,9 @@ static int sci_probe_single(struct platform_device *dev,
/* Sanity check */ /* Sanity check */
if (unlikely(index >= SCI_NPORTS)) { if (unlikely(index >= SCI_NPORTS)) {
dev_notice(&dev->dev, "Attempting to register port " dev_notice(&dev->dev, "Attempting to register port %d when only %d are available\n",
"%d when only %d are available.\n",
index+1, SCI_NPORTS); index+1, SCI_NPORTS);
dev_notice(&dev->dev, "Consider bumping " dev_notice(&dev->dev, "Consider bumping CONFIG_SERIAL_SH_SCI_NR_UARTS!\n");
"CONFIG_SERIAL_SH_SCI_NR_UARTS!\n");
return -EINVAL; return -EINVAL;
} }