USB: remove err() macro from usb class drivers

USB should not be having it's own printk macros, so remove err() and
use the system-wide standard of dev_err() wherever possible.  In the
few places that will not work out, use a basic printk().

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

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 68a2239cd0b6..b5775af3ba26 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -593,8 +593,9 @@ static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                 err = usblp_hp_channel_change_request(usblp,
                                         arg, &newChannel);
                                 if (err < 0) {
-                                        err("usblp%d: error = %d setting "
-                                                "HP channel",
+                                        dev_err(&usblp->dev->dev,
+                                                "usblp%d: error = %d setting "
+                                                "HP channel\n",
                                                 usblp->minor, err);
                                         retval = -EIO;
                                         goto done;
@@ -1345,7 +1346,7 @@ static void usblp_disconnect(struct usb_interface *intf)
         usb_deregister_dev(intf, &usblp_class);
 
         if (!usblp || !usblp->dev) {
-                err("bogus disconnect");
+                dev_err(&intf->dev, "bogus disconnect\n");
                 BUG ();
         }