USB: console.c: remove err() usage

err() was a very old USB-specific macro that I thought had
gone away.  This patch removes it from being used in the
driver and uses dev_err() instead.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 1ee6b2ab0f89..b9cca6dcde07 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -113,7 +113,8 @@ static int usb_console_setup(struct console *co, char *options)
         serial = usb_serial_get_by_index(co->index);
         if (serial == NULL) {
                 /* no device is connected yet, sorry :( */
-                err("No USB device connected to ttyUSB%i", co->index);
+                printk(KERN_ERR "No USB device connected to ttyUSB%i\n",
+                       co->index);
                 return -ENODEV;
         }
 
@@ -137,7 +138,7 @@ static int usb_console_setup(struct console *co, char *options)
                         tty = kzalloc(sizeof(*tty), GFP_KERNEL);
                         if (!tty) {
                                 retval = -ENOMEM;
-                                err("no more memory");
+                                dev_err(&port->dev, "no more memory\n");
                                 goto reset_open_count;
                         }
                         kref_init(&tty->kref);
@@ -146,7 +147,7 @@ static int usb_console_setup(struct console *co, char *options)
                         tty->index = co->index;
                         if (tty_init_termios(tty)) {
                                 retval = -ENOMEM;
-                                err("no more memory");
+                                dev_err(&port->dev, "no more memory\n");
                                 goto free_tty;
                         }
                 }
@@ -159,7 +160,7 @@ static int usb_console_setup(struct console *co, char *options)
                         retval = usb_serial_generic_open(NULL, port);
 
                 if (retval) {
-                        err("could not open USB console port");
+                        dev_err(&port->dev, "could not open USB console port\n");
                         goto fail;
                 }