]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
serial: core: Re-use struct uart_port {name} field
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 31 Mar 2017 18:35:18 +0000 (21:35 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 8 Apr 2017 16:51:57 +0000 (18:51 +0200)
Since we have port name stored in struct uart_port, we better to use
that one instead of open coding.

This will make it one place source for easier maintenance or
modifications.

While here, replace printk(KERN_INFO ) by pr_info(). It seems last printk()
call in serial_core.c.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/serial_core.c

index f5572e28d16a606a9fa9ff618d6daa4b7001eb32..0f45b7884a2c58a299668591e87bead1f6628f98 100644 (file)
@@ -2117,9 +2117,8 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
                for (tries = 3; !ops->tx_empty(uport) && tries; tries--)
                        msleep(10);
                if (!tries)
-                       dev_err(uport->dev, "%s%d: Unable to drain transmitter\n",
-                               drv->dev_name,
-                               drv->tty_driver->name_base + uport->line);
+                       dev_err(uport->dev, "%s: Unable to drain transmitter\n",
+                               uport->name);
 
                ops->shutdown(uport);
        }
@@ -2248,11 +2247,10 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
                break;
        }
 
-       printk(KERN_INFO "%s%s%s%d at %s (irq = %d, base_baud = %d) is a %s\n",
+       pr_info("%s%s%s at %s (irq = %d, base_baud = %d) is a %s\n",
               port->dev ? dev_name(port->dev) : "",
               port->dev ? ": " : "",
-              drv->dev_name,
-              drv->tty_driver->name_base + port->line,
+              port->name,
               address, port->irq, port->uartclk / 16, uart_type(port));
 }