aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-13 20:18:19 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-13 20:18:19 -0400
commitd44d9ab79212d56eea6b26f1e4925284861c347e (patch)
treee36d62cd6d5dafdee32ad7f0d6197f12b3e2f715
parent592ba39fab1072d6d37f4118f4b0efa15377ced5 (diff)
USB: serial: opticon.c: remove dbg() usage
dbg() was a very old USB-serial-specific macro. This patch removes it from being used in the driver and uses dev_dbg() instead. CC: Johan Hovold <jhovold@gmail.com> CC: Rusty Russell <rusty@rustcorp.com.au> CC: Alan Stern <stern@rowland.harvard.edu> CC: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/opticon.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 02cb1b7f6559..6f05d642362f 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -78,12 +78,12 @@ static void opticon_read_bulk_callback(struct urb *urb)
78 case -ENOENT: 78 case -ENOENT:
79 case -ESHUTDOWN: 79 case -ESHUTDOWN:
80 /* this urb is terminated, clean up */ 80 /* this urb is terminated, clean up */
81 dbg("%s - urb shutting down with status: %d", 81 dev_dbg(&priv->udev->dev, "%s - urb shutting down with status: %d\n",
82 __func__, status); 82 __func__, status);
83 return; 83 return;
84 default: 84 default:
85 dbg("%s - nonzero urb status received: %d", 85 dev_dbg(&priv->udev->dev, "%s - nonzero urb status received: %d\n",
86 __func__, status); 86 __func__, status);
87 goto exit; 87 goto exit;
88 } 88 }
89 89
@@ -229,8 +229,8 @@ static void opticon_write_control_callback(struct urb *urb)
229 kfree(urb->setup_packet); 229 kfree(urb->setup_packet);
230 230
231 if (status) 231 if (status)
232 dbg("%s - nonzero write bulk status received: %d", 232 dev_dbg(&priv->udev->dev, "%s - nonzero write bulk status received: %d\n",
233 __func__, status); 233 __func__, status);
234 234
235 spin_lock_irqsave(&priv->lock, flags); 235 spin_lock_irqsave(&priv->lock, flags);
236 --priv->outstanding_urbs; 236 --priv->outstanding_urbs;
@@ -253,7 +253,7 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port,
253 spin_lock_irqsave(&priv->lock, flags); 253 spin_lock_irqsave(&priv->lock, flags);
254 if (priv->outstanding_urbs > URB_UPPER_LIMIT) { 254 if (priv->outstanding_urbs > URB_UPPER_LIMIT) {
255 spin_unlock_irqrestore(&priv->lock, flags); 255 spin_unlock_irqrestore(&priv->lock, flags);
256 dbg("%s - write limit hit", __func__); 256 dev_dbg(&port->dev, "%s - write limit hit\n", __func__);
257 return 0; 257 return 0;
258 } 258 }
259 priv->outstanding_urbs++; 259 priv->outstanding_urbs++;
@@ -338,7 +338,7 @@ static int opticon_write_room(struct tty_struct *tty)
338 spin_lock_irqsave(&priv->lock, flags); 338 spin_lock_irqsave(&priv->lock, flags);
339 if (priv->outstanding_urbs > URB_UPPER_LIMIT * 2 / 3) { 339 if (priv->outstanding_urbs > URB_UPPER_LIMIT * 2 / 3) {
340 spin_unlock_irqrestore(&priv->lock, flags); 340 spin_unlock_irqrestore(&priv->lock, flags);
341 dbg("%s - write limit hit", __func__); 341 dev_dbg(&port->dev, "%s - write limit hit\n", __func__);
342 return 0; 342 return 0;
343 } 343 }
344 spin_unlock_irqrestore(&priv->lock, flags); 344 spin_unlock_irqrestore(&priv->lock, flags);
@@ -394,7 +394,7 @@ static int opticon_tiocmget(struct tty_struct *tty)
394 result |= TIOCM_CTS; 394 result |= TIOCM_CTS;
395 spin_unlock_irqrestore(&priv->lock, flags); 395 spin_unlock_irqrestore(&priv->lock, flags);
396 396
397 dbg("%s - %x", __func__, result); 397 dev_dbg(&port->dev, "%s - %x\n", __func__, result);
398 return result; 398 return result;
399} 399}
400 400
@@ -466,7 +466,7 @@ static int opticon_ioctl(struct tty_struct *tty,
466 struct usb_serial_port *port = tty->driver_data; 466 struct usb_serial_port *port = tty->driver_data;
467 struct opticon_private *priv = usb_get_serial_data(port->serial); 467 struct opticon_private *priv = usb_get_serial_data(port->serial);
468 468
469 dbg("%s - port %d, cmd = 0x%x", __func__, port->number, cmd); 469 dev_dbg(&port->dev, "%s - port %d, cmd = 0x%x\n", __func__, port->number, cmd);
470 470
471 switch (cmd) { 471 switch (cmd) {
472 case TIOCGSERIAL: 472 case TIOCGSERIAL: