USB: usb_wwan.c: remove err() usage
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Apr 2012 23:54:01 +0000 (16:54 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Apr 2012 23:54:01 +0000 (16:54 -0700)
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.

CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Alan Stern <stern@rowland.harvard.edu>
CC: Mauro Carvalho Chehab <mchehab@redhat.com>
CC: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/usb_wwan.c

index c88657dd31c88495a65a49f0aff2aca047f89481..194c5461290d78f838c9affb548edcaaf9dcd6c0 100644 (file)
@@ -725,8 +725,8 @@ int usb_wwan_resume(struct usb_serial *serial)
                err = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO);
                dbg("Submitted interrupt URB for port %d (result %d)", i, err);
                if (err < 0) {
-                       err("%s: Error %d for interrupt URB of port%d",
-                           __func__, err, i);
+                       dev_err(&port->dev, "%s: Error %d for interrupt URB\n",
+                               __func__, err);
                        goto err_out;
                }
        }
@@ -747,8 +747,8 @@ int usb_wwan_resume(struct usb_serial *serial)
                        urb = portdata->in_urbs[j];
                        err = usb_submit_urb(urb, GFP_ATOMIC);
                        if (err < 0) {
-                               err("%s: Error %d for bulk URB %d",
-                                   __func__, err, i);
+                               dev_err(&port->dev, "%s: Error %d for bulk URB %d\n",
+                                       __func__, err, i);
                                spin_unlock_irq(&intfdata->susp_lock);
                                goto err_out;
                        }