USB: remove use of err() in drivers/usb/serial

err() is going away, so switch to dev_err() or printk() if it's really
needed.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 12 insertions, 7 deletions

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 92ba4f7361e4..8be3f39891c7 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1121,7 +1121,8 @@ static int __init usb_serial_init(void)
 
         result = bus_register(&usb_serial_bus_type);
         if (result) {
-                err("%s - registering bus driver failed", __func__);
+                printk(KERN_ERR "usb-serial: %s - registering bus driver "
+                       "failed\n", __func__);
                 goto exit_bus;
         }
 
@@ -1142,21 +1143,24 @@ static int __init usb_serial_init(void)
         tty_set_operations(usb_serial_tty_driver, &serial_ops);
         result = tty_register_driver(usb_serial_tty_driver);
         if (result) {
-                err("%s - tty_register_driver failed", __func__);
+                printk(KERN_ERR "usb-serial: %s - tty_register_driver failed\n",
+                       __func__);
                 goto exit_reg_driver;
         }
 
         /* register the USB driver */
         result = usb_register(&usb_serial_driver);
         if (result < 0) {
-                err("%s - usb_register failed", __func__);
+                printk(KERN_ERR "usb-serial: %s - usb_register failed\n",
+                       __func__);
                 goto exit_tty;
         }
 
         /* register the generic driver, if we should */
         result = usb_serial_generic_register(debug);
         if (result < 0) {
-                err("%s - registering generic driver failed", __func__);
+                printk(KERN_ERR "usb-serial: %s - registering generic "
+                       "driver failed\n", __func__);
                 goto exit_generic;
         }
 
@@ -1174,7 +1178,8 @@ exit_reg_driver:
         bus_unregister(&usb_serial_bus_type);
 
 exit_bus:
-        err("%s - returning with error %d", __func__, result);
+        printk(KERN_ERR "usb-serial: %s - returning with error %d\n",
+               __func__, result);
         put_tty_driver(usb_serial_tty_driver);
         return result;
 }
@@ -1233,8 +1238,8 @@ int usb_serial_register(struct usb_serial_driver *driver)
 
         retval = usb_serial_bus_register(driver);
         if (retval) {
-                err("problem %d when registering driver %s",
-                                                retval, driver->description);
+                printk(KERN_ERR "usb-serial: problem %d when registering "
+                       "driver %s\n", retval, driver->description);
                 list_del(&driver->driver_list);
         } else
                 printk(KERN_INFO "USB Serial support registered for %s\n",