| Message ID | 1556369542-13247-7-git-send-email-info@metux.net (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [01/41] drivers: tty: serial: dz: use dev_err() instead of printk() | expand |
On Sat, 27 Apr 2019, Enrico Weigelt, metux IT consult wrote: > diff --git a/drivers/tty/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c > index 329aced..655961c 100644 > --- a/drivers/tty/serial/sb1250-duart.c > +++ b/drivers/tty/serial/sb1250-duart.c > @@ -663,7 +663,6 @@ static void sbd_release_port(struct uart_port *uport) > > static int sbd_map_port(struct uart_port *uport) > { > - const char *err = KERN_ERR "sbd: Cannot map MMIO\n"; > struct sbd_port *sport = to_sport(uport); > struct sbd_duart *duart = sport->duart; > > @@ -671,7 +670,7 @@ static int sbd_map_port(struct uart_port *uport) > uport->membase = ioremap_nocache(uport->mapbase, > DUART_CHANREG_SPACING); > if (!uport->membase) { > - printk(err); > + dev_err(uport->dev, "Cannot map MMIO (base)\n"); > return -ENOMEM; > } > > @@ -679,7 +678,7 @@ static int sbd_map_port(struct uart_port *uport) > sport->memctrl = ioremap_nocache(duart->mapctrl, > DUART_CHANREG_SPACING); > if (!sport->memctrl) { > - printk(err); > + dev_err(uport->dev, "Cannot map MMIO (ctrl)\n"); > iounmap(uport->membase); > uport->membase = NULL; > return -ENOMEM; Hmm, what's the point to have separate messages, which consume extra memory, for a hardly if at all possible error condition? Maciej
diff --git a/drivers/tty/serial/sb1250-duart.c b/drivers/tty/serial/sb1250-duart.c index 329aced..655961c 100644 --- a/drivers/tty/serial/sb1250-duart.c +++ b/drivers/tty/serial/sb1250-duart.c @@ -663,7 +663,6 @@ static void sbd_release_port(struct uart_port *uport) static int sbd_map_port(struct uart_port *uport) { - const char *err = KERN_ERR "sbd: Cannot map MMIO\n"; struct sbd_port *sport = to_sport(uport); struct sbd_duart *duart = sport->duart; @@ -671,7 +670,7 @@ static int sbd_map_port(struct uart_port *uport) uport->membase = ioremap_nocache(uport->mapbase, DUART_CHANREG_SPACING); if (!uport->membase) { - printk(err); + dev_err(uport->dev, "Cannot map MMIO (base)\n"); return -ENOMEM; } @@ -679,7 +678,7 @@ static int sbd_map_port(struct uart_port *uport) sport->memctrl = ioremap_nocache(duart->mapctrl, DUART_CHANREG_SPACING); if (!sport->memctrl) { - printk(err); + dev_err(uport->dev, "Cannot map MMIO (ctrl)\n"); iounmap(uport->membase); uport->membase = NULL; return -ENOMEM;
Using dev_err() instead of printk() for more consistent output. (prints device name, etc). Signed-off-by: Enrico Weigelt <info@metux.net> --- drivers/tty/serial/sb1250-duart.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)