aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/misc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-02 00:34:11 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-02 00:34:11 -0400
commitaadd6472d904c374e31c952fbf634e21e28807e0 (patch)
treebc77f978628cfd52b6ec0e4e11f3cb4cc469f46d /drivers/usb/misc
parent7a2d281060fad7ef9220b8c051da38eae6c5f366 (diff)
USB: yurex.c: remove dbg() usage
dbg() was a very old USB-specific macro that should no longer be used. This patch removes it from being used in the driver and uses dev_dbg() instead. CC: Tomoki Sekiyama <tomoki.sekiyama@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/misc')
-rw-r--r--drivers/usb/misc/yurex.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c
index 1d8ad4c5b99e..42ad2e6d86c4 100644
--- a/drivers/usb/misc/yurex.c
+++ b/drivers/usb/misc/yurex.c
@@ -95,7 +95,7 @@ static void yurex_delete(struct kref *kref)
95{ 95{
96 struct usb_yurex *dev = to_yurex_dev(kref); 96 struct usb_yurex *dev = to_yurex_dev(kref);
97 97
98 dbg("yurex_delete"); 98 dev_dbg(&dev->interface->dev, "%s\n", __func__);
99 99
100 usb_put_dev(dev->udev); 100 usb_put_dev(dev->udev);
101 if (dev->cntl_urb) { 101 if (dev->cntl_urb) {
@@ -165,16 +165,19 @@ static void yurex_interrupt(struct urb *urb)
165 if (i != 5) 165 if (i != 5)
166 dev->bbu <<= 8; 166 dev->bbu <<= 8;
167 } 167 }
168 dbg("%s count: %lld", __func__, dev->bbu); 168 dev_dbg(&dev->interface->dev, "%s count: %lld\n",
169 __func__, dev->bbu);
169 spin_unlock_irqrestore(&dev->lock, flags); 170 spin_unlock_irqrestore(&dev->lock, flags);
170 171
171 kill_fasync(&dev->async_queue, SIGIO, POLL_IN); 172 kill_fasync(&dev->async_queue, SIGIO, POLL_IN);
172 } 173 }
173 else 174 else
174 dbg("data format error - no EOF"); 175 dev_dbg(&dev->interface->dev,
176 "data format error - no EOF\n");
175 break; 177 break;
176 case CMD_ACK: 178 case CMD_ACK:
177 dbg("%s ack: %c", __func__, buf[1]); 179 dev_dbg(&dev->interface->dev, "%s ack: %c\n",
180 __func__, buf[1]);
178 wake_up_interruptible(&dev->waitq); 181 wake_up_interruptible(&dev->waitq);
179 break; 182 break;
180 } 183 }
@@ -509,7 +512,8 @@ static ssize_t yurex_write(struct file *file, const char *user_buffer, size_t co
509 512
510 /* send the data as the control msg */ 513 /* send the data as the control msg */
511 prepare_to_wait(&dev->waitq, &wait, TASK_INTERRUPTIBLE); 514 prepare_to_wait(&dev->waitq, &wait, TASK_INTERRUPTIBLE);
512 dbg("%s - submit %c", __func__, dev->cntl_buffer[0]); 515 dev_dbg(&dev->interface->dev, "%s - submit %c\n", __func__,
516 dev->cntl_buffer[0]);
513 retval = usb_submit_urb(dev->cntl_urb, GFP_KERNEL); 517 retval = usb_submit_urb(dev->cntl_urb, GFP_KERNEL);
514 if (retval >= 0) 518 if (retval >= 0)
515 timeout = schedule_timeout(YUREX_WRITE_TIMEOUT); 519 timeout = schedule_timeout(YUREX_WRITE_TIMEOUT);