aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-20 19:54:01 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-20 19:54:01 -0400
commit3a1c2a82204f5376f484d82cb18189afc2145c77 (patch)
tree4fd51ebd189581fdb42f9e6260b327c571a57cbc
parent461863df3c8d4402495684eff9c11cc7e3f8aaea (diff)
USB: usb_wwan.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. 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>
-rw-r--r--drivers/usb/serial/usb_wwan.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index c88657dd31c..194c5461290 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -725,8 +725,8 @@ int usb_wwan_resume(struct usb_serial *serial)
725 err = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO); 725 err = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO);
726 dbg("Submitted interrupt URB for port %d (result %d)", i, err); 726 dbg("Submitted interrupt URB for port %d (result %d)", i, err);
727 if (err < 0) { 727 if (err < 0) {
728 err("%s: Error %d for interrupt URB of port%d", 728 dev_err(&port->dev, "%s: Error %d for interrupt URB\n",
729 __func__, err, i); 729 __func__, err);
730 goto err_out; 730 goto err_out;
731 } 731 }
732 } 732 }
@@ -747,8 +747,8 @@ int usb_wwan_resume(struct usb_serial *serial)
747 urb = portdata->in_urbs[j]; 747 urb = portdata->in_urbs[j];
748 err = usb_submit_urb(urb, GFP_ATOMIC); 748 err = usb_submit_urb(urb, GFP_ATOMIC);
749 if (err < 0) { 749 if (err < 0) {
750 err("%s: Error %d for bulk URB %d", 750 dev_err(&port->dev, "%s: Error %d for bulk URB %d\n",
751 __func__, err, i); 751 __func__, err, i);
752 spin_unlock_irq(&intfdata->susp_lock); 752 spin_unlock_irq(&intfdata->susp_lock);
753 goto err_out; 753 goto err_out;
754 } 754 }