aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/cyberjack.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-18 04:58:57 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-18 04:58:57 -0400
commit59d33f2fc2d63796296b1b76143e039d6e7cf532 (patch)
treee754135e560ab7478694c942fe65bc4ea325053b /drivers/usb/serial/cyberjack.c
parent82760526e6d2e1d1e815abaf3eae42b8bb82968c (diff)
USB: serial: remove debug parameter from usb_serial_debug_data()
We should use dev_dbg() for usb_serial_debug_data() like all of the rest of the usb-serial drivers use, so remove the debug parameter as it's not needed. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/cyberjack.c')
-rw-r--r--drivers/usb/serial/cyberjack.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 9c90575cf354..17066daeae46 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -222,8 +222,7 @@ static int cyberjack_write(struct tty_struct *tty,
222 /* Copy data */ 222 /* Copy data */
223 memcpy(priv->wrbuf + priv->wrfilled, buf, count); 223 memcpy(priv->wrbuf + priv->wrfilled, buf, count);
224 224
225 usb_serial_debug_data(debug, dev, __func__, count, 225 usb_serial_debug_data(dev, __func__, count, priv->wrbuf + priv->wrfilled);
226 priv->wrbuf + priv->wrfilled);
227 priv->wrfilled += count; 226 priv->wrfilled += count;
228 227
229 if (priv->wrfilled >= 3) { 228 if (priv->wrfilled >= 3) {
@@ -295,7 +294,7 @@ static void cyberjack_read_int_callback(struct urb *urb)
295 if (status) 294 if (status)
296 return; 295 return;
297 296
298 usb_serial_debug_data(debug, dev, __func__, urb->actual_length, data); 297 usb_serial_debug_data(dev, __func__, urb->actual_length, data);
299 298
300 /* React only to interrupts signaling a bulk_in transfer */ 299 /* React only to interrupts signaling a bulk_in transfer */
301 if (urb->actual_length == 4 && data[0] == 0x01) { 300 if (urb->actual_length == 4 && data[0] == 0x01) {
@@ -348,8 +347,7 @@ static void cyberjack_read_bulk_callback(struct urb *urb)
348 int result; 347 int result;
349 int status = urb->status; 348 int status = urb->status;
350 349
351 usb_serial_debug_data(debug, &port->dev, __func__, 350 usb_serial_debug_data(dev, __func__, urb->actual_length, data);
352 urb->actual_length, data);
353 if (status) { 351 if (status) {
354 dev_dbg(dev, "%s - nonzero read bulk status received: %d\n", 352 dev_dbg(dev, "%s - nonzero read bulk status received: %d\n",
355 __func__, status); 353 __func__, status);