| Message ID | 20231130-mbly-uart-v5-5-6566703a04b5@bootlin.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v5,1/9] tty: serial: amba: cleanup whitespace | expand |
Le 30/11/2023 à 15:07, Théo Lebrun a écrit : > Remove all instances of quoted strings split across lines. Fix four > checkpatch warnings: > > $ ./scripts/checkpatch.pl --strict --file \ > drivers/tty/serial/amba-pl011.c > WARNING: quoted string split across lines > [...] > > Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com> > --- > drivers/tty/serial/amba-pl011.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c > index 743dee75c68b..be8888db1a37 100644 > --- a/drivers/tty/serial/amba-pl011.c > +++ b/drivers/tty/serial/amba-pl011.c > @@ -973,8 +973,8 @@ static void pl011_dma_rx_irq(struct uart_amba_port *uap) > /* Switch buffer & re-trigger DMA job */ > dmarx->use_buf_b = !dmarx->use_buf_b; > if (pl011_dma_rx_trigger_dma(uap)) { > - dev_dbg(uap->port.dev, "could not retrigger RX DMA job " > - "fall back to interrupt mode\n"); > + dev_dbg(uap->port.dev, > + "could not retrigger RX DMA job fall back to interrupt mode\n"); > uap->im |= UART011_RXIM; > pl011_write(uap->im, uap, REG_IMSC); > } > @@ -1021,8 +1021,8 @@ static void pl011_dma_rx_callback(void *data) > * get some IRQ immediately from RX. > */ > if (ret) { > - dev_dbg(uap->port.dev, "could not retrigger RX DMA job " > - "fall back to interrupt mode\n"); > + dev_dbg(uap->port.dev, > + "could not retrigger RX DMA job fall back to interrupt mode\n"); > uap->im |= UART011_RXIM; > pl011_write(uap->im, uap, REG_IMSC); > } > @@ -1158,8 +1158,8 @@ static void pl011_dma_startup(struct uart_amba_port *uap) > > if (uap->using_rx_dma) { > if (pl011_dma_rx_trigger_dma(uap)) > - dev_dbg(uap->port.dev, "could not trigger initial " > - "RX DMA job, fall back to interrupt mode\n"); > + dev_dbg(uap->port.dev, > + "could not trigger initial RX DMA job, fall back to interrupt mode\n"); > if (uap->dmarx.poll_rate) { Hi, I think that having a comma just before "fall back", as done here, would make the other 3 messages clearer. CJ > timer_setup(&uap->dmarx.timer, pl011_dma_rx_poll, 0); > mod_timer(&uap->dmarx.timer, > @@ -1391,8 +1391,8 @@ __acquires(&uap->port.lock) > */ > if (pl011_dma_rx_available(uap)) { > if (pl011_dma_rx_trigger_dma(uap)) { > - dev_dbg(uap->port.dev, "could not trigger RX DMA job " > - "fall back to interrupt mode again\n"); > + dev_dbg(uap->port.dev, > + "could not trigger RX DMA job fall back to interrupt mode again\n"); > uap->im |= UART011_RXIM; > pl011_write(uap->im, uap, REG_IMSC); > } else { >
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 743dee75c68b..be8888db1a37 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -973,8 +973,8 @@ static void pl011_dma_rx_irq(struct uart_amba_port *uap) /* Switch buffer & re-trigger DMA job */ dmarx->use_buf_b = !dmarx->use_buf_b; if (pl011_dma_rx_trigger_dma(uap)) { - dev_dbg(uap->port.dev, "could not retrigger RX DMA job " - "fall back to interrupt mode\n"); + dev_dbg(uap->port.dev, + "could not retrigger RX DMA job fall back to interrupt mode\n"); uap->im |= UART011_RXIM; pl011_write(uap->im, uap, REG_IMSC); } @@ -1021,8 +1021,8 @@ static void pl011_dma_rx_callback(void *data) * get some IRQ immediately from RX. */ if (ret) { - dev_dbg(uap->port.dev, "could not retrigger RX DMA job " - "fall back to interrupt mode\n"); + dev_dbg(uap->port.dev, + "could not retrigger RX DMA job fall back to interrupt mode\n"); uap->im |= UART011_RXIM; pl011_write(uap->im, uap, REG_IMSC); } @@ -1158,8 +1158,8 @@ static void pl011_dma_startup(struct uart_amba_port *uap) if (uap->using_rx_dma) { if (pl011_dma_rx_trigger_dma(uap)) - dev_dbg(uap->port.dev, "could not trigger initial " - "RX DMA job, fall back to interrupt mode\n"); + dev_dbg(uap->port.dev, + "could not trigger initial RX DMA job, fall back to interrupt mode\n"); if (uap->dmarx.poll_rate) { timer_setup(&uap->dmarx.timer, pl011_dma_rx_poll, 0); mod_timer(&uap->dmarx.timer, @@ -1391,8 +1391,8 @@ __acquires(&uap->port.lock) */ if (pl011_dma_rx_available(uap)) { if (pl011_dma_rx_trigger_dma(uap)) { - dev_dbg(uap->port.dev, "could not trigger RX DMA job " - "fall back to interrupt mode again\n"); + dev_dbg(uap->port.dev, + "could not trigger RX DMA job fall back to interrupt mode again\n"); uap->im |= UART011_RXIM; pl011_write(uap->im, uap, REG_IMSC); } else {
Remove all instances of quoted strings split across lines. Fix four checkpatch warnings: $ ./scripts/checkpatch.pl --strict --file \ drivers/tty/serial/amba-pl011.c WARNING: quoted string split across lines [...] Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com> --- drivers/tty/serial/amba-pl011.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)