Merge tag 'devicetree-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

[karo-tx-linux.git] / drivers / tty / tty_port.c

diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index 482f33f2004336abd3c99686600cf9bc2382f2ad..846ed481c24fecec26bb4871589a9288792135be 100644 (file)
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
@@ -462,14 +462,13 @@ int tty_port_close_start(struct tty_port *port,
 
        spin_lock_irqsave(&port->lock, flags);
        if (tty->count == 1 && port->count != 1) {
-               printk(KERN_WARNING
-                   "tty_port_close_start: tty->count = 1 port count = %d.\n",
-                                                               port->count);
+               tty_warn(tty, "%s: tty->count = 1 port count = %d\n", __func__,
+                        port->count);
                port->count = 1;
        }
        if (--port->count < 0) {
-               printk(KERN_WARNING "tty_port_close_start: count = %d\n",
-                                                               port->count);
+               tty_warn(tty, "%s: bad port count (%d)\n", __func__,
+                        port->count);
                port->count = 0;
        }