1 files changed, 40 insertions, 25 deletions

diff --git a/drivers/usb/misc/rio500.c b/drivers/usb/misc/rio500.c
index 487a8ce0775..1084124c4a4 100644
--- a/drivers/usb/misc/rio500.c
+++ b/drivers/usb/misc/rio500.c
@@ -153,10 +153,10 @@ static long ioctl_rio(struct file *file, unsigned int cmd, unsigned long arg)
 
                 requesttype = rio_cmd.requesttype | USB_DIR_IN |
                     USB_TYPE_VENDOR | USB_RECIP_DEVICE;
-                dbg
-                    ("sending command:reqtype=%0x req=%0x value=%0x index=%0x len=%0x",
-                     requesttype, rio_cmd.request, rio_cmd.value,
-                     rio_cmd.index, rio_cmd.length);
+                dev_dbg(&rio->rio_dev->dev,
+                        "sending command:reqtype=%0x req=%0x value=%0x index=%0x len=%0x\n",
+                        requesttype, rio_cmd.request, rio_cmd.value,
+                        rio_cmd.index, rio_cmd.length);
                 /* Send rio control message */
                 retries = 3;
                 while (retries) {
@@ -171,11 +171,14 @@ static long ioctl_rio(struct file *file, unsigned int cmd, unsigned long arg)
                         if (result == -ETIMEDOUT)
                                 retries--;
                         else if (result < 0) {
-                                err("Error executing ioctrl. code = %d", result);
+                                dev_err(&rio->rio_dev->dev,
+                                        "Error executing ioctrl. code = %d\n",
+                                        result);
                                 retries = 0;
                         } else {
-                                dbg("Executed ioctl. Result = %d (data=%02x)",
-                                     result, buffer[0]);
+                                dev_dbg(&rio->rio_dev->dev,
+                                        "Executed ioctl. Result = %d (data=%02x)\n",
+                                        result, buffer[0]);
                                 if (copy_to_user(rio_cmd.buffer, buffer,
                                                  rio_cmd.length)) {
                                         free_page((unsigned long) buffer);
@@ -221,9 +224,10 @@ static long ioctl_rio(struct file *file, unsigned int cmd, unsigned long arg)
 
                 requesttype = rio_cmd.requesttype | USB_DIR_OUT |
                     USB_TYPE_VENDOR | USB_RECIP_DEVICE;
-                dbg("sending command: reqtype=%0x req=%0x value=%0x index=%0x len=%0x",
-                     requesttype, rio_cmd.request, rio_cmd.value,
-                     rio_cmd.index, rio_cmd.length);
+                dev_dbg(&rio->rio_dev->dev,
+                        "sending command: reqtype=%0x req=%0x value=%0x index=%0x len=%0x\n",
+                        requesttype, rio_cmd.request, rio_cmd.value,
+                        rio_cmd.index, rio_cmd.length);
                 /* Send rio control message */
                 retries = 3;
                 while (retries) {
@@ -238,10 +242,13 @@ static long ioctl_rio(struct file *file, unsigned int cmd, unsigned long arg)
                         if (result == -ETIMEDOUT)
                                 retries--;
                         else if (result < 0) {
-                                err("Error executing ioctrl. code = %d", result);
+                                dev_err(&rio->rio_dev->dev,
+                                        "Error executing ioctrl. code = %d\n",
+                                        result);
                                 retries = 0;
                         } else {
-                                dbg("Executed ioctl. Result = %d", result);
+                                dev_dbg(&rio->rio_dev->dev,
+                                        "Executed ioctl. Result = %d\n", result);
                                 retries = 0;
 
                         }
@@ -313,8 +320,9 @@ write_rio(struct file *file, const char __user *buffer,
                                          usb_sndbulkpipe(rio->rio_dev, 2),
                                          obuf, thistime, &partial, 5000);
 
-                        dbg("write stats: result:%d thistime:%lu partial:%u",
-                             result, thistime, partial);
+                        dev_dbg(&rio->rio_dev->dev,
+                                "write stats: result:%d thistime:%lu partial:%u\n",
+                                result, thistime, partial);
 
                         if (result == -ETIMEDOUT) {     /* NAK - so hold for a while */
                                 if (!maxretry--) {
@@ -332,7 +340,8 @@ write_rio(struct file *file, const char __user *buffer,
                                 break;
                 };
                 if (result) {
-                        err("Write Whoops - %x", result);
+                        dev_err(&rio->rio_dev->dev, "Write Whoops - %x\n",
+                                result);
                         errn = -EIO;
                         goto error;
                 }
@@ -393,15 +402,17 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos)
                                       ibuf, this_read, &partial,
                                       8000);
 
-                dbg("read stats: result:%d this_read:%u partial:%u",
-                       result, this_read, partial);
+                dev_dbg(&rio->rio_dev->dev,
+                        "read stats: result:%d this_read:%u partial:%u\n",
+                        result, this_read, partial);
 
                 if (partial) {
                         count = this_read = partial;
                 } else if (result == -ETIMEDOUT || result == 15) {      /* FIXME: 15 ??? */
                         if (!maxretry--) {
                                 mutex_unlock(&(rio->lock));
-                                err("read_rio: maxretry timeout");
+                                dev_err(&rio->rio_dev->dev,
+                                        "read_rio: maxretry timeout\n");
                                 return -ETIME;
                         }
                         prepare_to_wait(&rio->wait_q, &wait, TASK_INTERRUPTIBLE);
@@ -410,8 +421,9 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos)
                         continue;
                 } else if (result != -EREMOTEIO) {
                         mutex_unlock(&(rio->lock));
-                        err("Read Whoops - result:%u partial:%u this_read:%u",
-                             result, partial, this_read);
+                        dev_err(&rio->rio_dev->dev,
+                                "Read Whoops - result:%u partial:%u this_read:%u\n",
+                                result, partial, this_read);
                         return -EIO;
                 } else {
                         mutex_unlock(&(rio->lock));
@@ -459,26 +471,29 @@ static int probe_rio(struct usb_interface *intf,
 
         retval = usb_register_dev(intf, &usb_rio_class);
         if (retval) {
-                err("Not able to get a minor for this device.");
+                dev_err(&dev->dev,
+                        "Not able to get a minor for this device.\n");
                 return -ENOMEM;
         }
 
         rio->rio_dev = dev;
 
         if (!(rio->obuf = kmalloc(OBUF_SIZE, GFP_KERNEL))) {
-                err("probe_rio: Not enough memory for the output buffer");
+                dev_err(&dev->dev,
+                        "probe_rio: Not enough memory for the output buffer\n");
                 usb_deregister_dev(intf, &usb_rio_class);
                 return -ENOMEM;
         }
-        dbg("probe_rio: obuf address:%p", rio->obuf);
+        dev_dbg(&intf->dev, "obuf address:%p\n", rio->obuf);
 
         if (!(rio->ibuf = kmalloc(IBUF_SIZE, GFP_KERNEL))) {
-                err("probe_rio: Not enough memory for the input buffer");
+                dev_err(&dev->dev,
+                        "probe_rio: Not enough memory for the input buffer\n");
                 usb_deregister_dev(intf, &usb_rio_class);
                 kfree(rio->obuf);
                 return -ENOMEM;
         }
-        dbg("probe_rio: ibuf address:%p", rio->ibuf);
+        dev_dbg(&intf->dev, "ibuf address:%p\n", rio->ibuf);
 
         mutex_init(&(rio->lock));