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, 9 insertions, 6 deletions

diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index 40cff61cb4a2..4b463cd140ef 100644
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -256,11 +256,12 @@ static void safe_read_bulk_callback(struct urb *urb)
                                                         data, actual_length);
                                 tty_flip_buffer_push(tty);
                         } else {
-                                err("%s - inconsistent lengths %d:%d",
+                                dev_err(&port->dev,
+                                        "%s - inconsistent lengths %d:%d\n",
                                         __func__, actual_length, length);
                         }
                 } else {
-                        err("%s - bad CRC %x", __func__, fcs);
+                        dev_err(&port->dev, "%s - bad CRC %x\n", __func__, fcs);
                 }
         } else {
                 tty_insert_flip_string(tty, data, length);
@@ -277,8 +278,9 @@ static void safe_read_bulk_callback(struct urb *urb)
 
         result = usb_submit_urb(urb, GFP_ATOMIC);
         if (result)
-                err("%s - failed resubmitting read urb, error %d",
-                                                        __func__, result);
+                dev_err(&port->dev,
+                        "%s - failed resubmitting read urb, error %d\n",
+                        __func__, result);
                 /* FIXME: Need a mechanism to retry later if this happens */
 }
 
@@ -369,8 +371,9 @@ static int safe_write(struct tty_struct *tty, struct usb_serial_port *port,
         result = usb_submit_urb(port->write_urb, GFP_KERNEL);
         if (result) {
                 port->write_urb_busy = 0;
-                err("%s - failed submitting write urb, error %d",
-                                                        __func__, result);
+                dev_err(&port->dev,
+                        "%s - failed submitting write urb, error %d\n",
+                        __func__, result);
                 return 0;
         }
         dbg("%s urb: %p submitted", __func__, port->write_urb);