USB: remove err() macro from more usb 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, 30 insertions, 16 deletions

diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c
index dd432c8feaf8..878c77ca086e 100644
--- a/drivers/usb/image/mdc800.c
+++ b/drivers/usb/image/mdc800.c
@@ -355,7 +355,7 @@ static int mdc800_usb_waitForIRQ (int mode, int msec)
         if (mdc800->camera_request_ready>0)
         {
                 mdc800->camera_request_ready=0;
-                err ("timeout waiting for camera.");
+                dev_err(&mdc800->dev->dev, "timeout waiting for camera.\n");
                 return -1;
         }
         
@@ -380,7 +380,8 @@ static void mdc800_usb_write_notify (struct urb *urb)
         int status = urb->status;
 
         if (status != 0)
-                err ("writing command fails (status=%i)", status);
+                dev_err(&mdc800->dev->dev,
+                        "writing command fails (status=%i)\n", status);
         else
                 mdc800->state=READY;
         mdc800->written = 1;
@@ -407,7 +408,8 @@ static void mdc800_usb_download_notify (struct urb *urb)
                         mdc800->state=READY;
                 }
         } else {
-                err ("request bytes fails (status:%i)", status);
+                dev_err(&mdc800->dev->dev,
+                        "request bytes fails (status:%i)\n", status);
         }
         mdc800->downloaded = 1;
         wake_up (&mdc800->download_wait);
@@ -450,7 +452,8 @@ static int mdc800_usb_probe (struct usb_interface *intf,
 
         if (dev->descriptor.bNumConfigurations != 1)
         {
-                err ("probe fails -> wrong Number of Configuration");
+                dev_err(&intf->dev,
+                        "probe fails -> wrong Number of Configuration\n");
                 return -ENODEV;
         }
         intf_desc = intf->cur_altsetting;
@@ -462,7 +465,7 @@ static int mdc800_usb_probe (struct usb_interface *intf,
                 || ( intf_desc->desc.bNumEndpoints != 4)
         )
         {
-                err ("probe fails -> wrong Interface");
+                dev_err(&intf->dev, "probe fails -> wrong Interface\n");
                 return -ENODEV;
         }
 
@@ -483,7 +486,7 @@ static int mdc800_usb_probe (struct usb_interface *intf,
                 }
                 if (mdc800->endpoint[i] == -1)
                 {
-                        err ("probe fails -> Wrong Endpoints.");
+                        dev_err(&intf->dev, "probe fails -> Wrong Endpoints.\n");
                         return -ENODEV;
                 }
         }
@@ -495,7 +498,7 @@ static int mdc800_usb_probe (struct usb_interface *intf,
 
         retval = usb_register_dev(intf, &mdc800_class);
         if (retval) {
-                err ("Not able to get a minor for this device.");
+                dev_err(&intf->dev, "Not able to get a minor for this device.\n");
                 return -ENODEV;
         }
 
@@ -645,7 +648,8 @@ static int mdc800_device_open (struct inode* inode, struct file *file)
         mdc800->irq_urb->dev = mdc800->dev;
         retval = usb_submit_urb (mdc800->irq_urb, GFP_KERNEL);
         if (retval) {
-                err ("request USB irq fails (submit_retval=%i).", retval);
+                dev_err(&mdc800->dev->dev,
+                        "request USB irq fails (submit_retval=%i).\n", retval);
                 errn = -EIO;
                 goto error_out;
         }
@@ -735,7 +739,9 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l
                                 mdc800->download_urb->dev = mdc800->dev;
                                 retval = usb_submit_urb (mdc800->download_urb, GFP_KERNEL);
                                 if (retval) {
-                                        err ("Can't submit download urb (retval=%i)",retval);
+                                        dev_err(&mdc800->dev->dev,
+                                                "Can't submit download urb "
+                                                "(retval=%i)\n", retval);
                                         mutex_unlock(&mdc800->io_lock);
                                         return len-left;
                                 }
@@ -744,7 +750,10 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l
                                 mdc800->downloaded = 0;
                                 if (mdc800->download_urb->status != 0)
                                 {
-                                        err ("request download-bytes fails (status=%i)",mdc800->download_urb->status);
+                                        dev_err(&mdc800->dev->dev,
+                                                "request download-bytes fails "
+                                                "(status=%i)\n",
+                                                mdc800->download_urb->status);
                                         mutex_unlock(&mdc800->io_lock);
                                         return len-left;
                                 }
@@ -841,7 +850,8 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
 
                         if (mdc800_usb_waitForIRQ (0,TO_GET_READY))
                         {
-                                err ("Camera didn't get ready.\n");
+                                dev_err(&mdc800->dev->dev,
+                                        "Camera didn't get ready.\n");
                                 mutex_unlock(&mdc800->io_lock);
                                 return -EIO;
                         }
@@ -853,7 +863,9 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
                         mdc800->write_urb->dev = mdc800->dev;
                         retval = usb_submit_urb (mdc800->write_urb, GFP_KERNEL);
                         if (retval) {
-                                err ("submitting write urb fails (retval=%i)", retval);
+                                dev_err(&mdc800->dev->dev,
+                                        "submitting write urb fails "
+                                        "(retval=%i)\n", retval);
                                 mutex_unlock(&mdc800->io_lock);
                                 return -EIO;
                         }
@@ -872,7 +884,9 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
                                 case 0x3e: /* Take shot in Fine Mode (WCam Mode) */
                                         if (mdc800->pic_len < 0)
                                         {
-                                                err ("call 0x07 before 0x05,0x3e");
+                                                dev_err(&mdc800->dev->dev,
+                                                        "call 0x07 before "
+                                                        "0x05,0x3e\n");
                                                 mdc800->state=READY;
                                                 mutex_unlock(&mdc800->io_lock);
                                                 return -EIO;
@@ -892,7 +906,7 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
 
                                                 if (mdc800_usb_waitForIRQ (1,TO_READ_FROM_IRQ))
                                                 {
-                                                        err ("requesting answer from irq fails");
+                                                        dev_err(&mdc800->dev->dev, "requesting answer from irq fails\n");
                                                         mutex_unlock(&mdc800->io_lock);
                                                         return -EIO;
                                                 }
@@ -920,7 +934,7 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
                                         {
                                                 if (mdc800_usb_waitForIRQ (0,TO_DEFAULT_COMMAND))
                                                 {
-                                                        err ("Command Timeout.");
+                                                        dev_err(&mdc800->dev->dev, "Command Timeout.\n");
                                                         mutex_unlock(&mdc800->io_lock);
                                                         return -EIO;
                                                 }
@@ -1031,7 +1045,7 @@ cleanup_on_fail:
 
         if (mdc800 != NULL)
         {
-                err ("can't alloc memory!");
+                printk(KERN_ERR "mdc800: can't alloc memory!\n");
 
                 kfree(mdc800->download_urb_buffer);
                 kfree(mdc800->write_urb_buffer);