aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/io_ti.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/io_ti.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/io_ti.c')
-rw-r--r--drivers/usb/serial/io_ti.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 54916d724145..c6b82833a157 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -321,8 +321,7 @@ static int read_download_mem(struct usb_device *dev, int start_address,
321 } 321 }
322 322
323 if (read_length > 1) 323 if (read_length > 1)
324 usb_serial_debug_data(debug, &dev->dev, __func__, 324 usb_serial_debug_data(&dev->dev, __func__, read_length, buffer);
325 read_length, buffer);
326 325
327 /* Update pointers/length */ 326 /* Update pointers/length */
328 start_address += read_length; 327 start_address += read_length;
@@ -359,8 +358,7 @@ static int read_boot_mem(struct edgeport_serial *serial,
359 358
360 dev_dbg(&serial->serial->dev->dev, "%s - start_address = %x, length = %d\n", 359 dev_dbg(&serial->serial->dev->dev, "%s - start_address = %x, length = %d\n",
361 __func__, start_address, length); 360 __func__, start_address, length);
362 usb_serial_debug_data(debug, &serial->serial->dev->dev, 361 usb_serial_debug_data(&serial->serial->dev->dev, __func__, length, buffer);
363 __func__, length, buffer);
364 362
365 serial->TiReadI2C = 1; 363 serial->TiReadI2C = 1;
366 364
@@ -398,8 +396,7 @@ static int write_boot_mem(struct edgeport_serial *serial,
398 } 396 }
399 397
400 dev_dbg(&serial->serial->dev->dev, "%s - start_sddr = %x, length = %d\n", __func__, start_address, length); 398 dev_dbg(&serial->serial->dev->dev, "%s - start_sddr = %x, length = %d\n", __func__, start_address, length);
401 usb_serial_debug_data(debug, &serial->serial->dev->dev, 399 usb_serial_debug_data(&serial->serial->dev->dev, __func__, length, buffer);
402 __func__, length, buffer);
403 400
404 return status; 401 return status;
405} 402}
@@ -425,7 +422,7 @@ static int write_i2c_mem(struct edgeport_serial *serial,
425 422
426 dev_dbg(dev, "%s - BytesInFirstPage Addr = %x, length = %d\n", 423 dev_dbg(dev, "%s - BytesInFirstPage Addr = %x, length = %d\n",
427 __func__, start_address, write_length); 424 __func__, start_address, write_length);
428 usb_serial_debug_data(debug, dev, __func__, write_length, buffer); 425 usb_serial_debug_data(dev, __func__, write_length, buffer);
429 426
430 /* Write first page */ 427 /* Write first page */
431 be_start_address = cpu_to_be16(start_address); 428 be_start_address = cpu_to_be16(start_address);
@@ -452,7 +449,7 @@ static int write_i2c_mem(struct edgeport_serial *serial,
452 449
453 dev_dbg(dev, "%s - Page Write Addr = %x, length = %d\n", 450 dev_dbg(dev, "%s - Page Write Addr = %x, length = %d\n",
454 __func__, start_address, write_length); 451 __func__, start_address, write_length);
455 usb_serial_debug_data(debug, dev, __func__, write_length, buffer); 452 usb_serial_debug_data(dev, __func__, write_length, buffer);
456 453
457 /* Write next page */ 454 /* Write next page */
458 be_start_address = cpu_to_be16(start_address); 455 be_start_address = cpu_to_be16(start_address);
@@ -1622,7 +1619,7 @@ static void edge_interrupt_callback(struct urb *urb)
1622 } 1619 }
1623 1620
1624 dev = &edge_serial->serial->dev->dev; 1621 dev = &edge_serial->serial->dev->dev;
1625 usb_serial_debug_data(debug, dev, __func__, length, data); 1622 usb_serial_debug_data(dev, __func__, length, data);
1626 1623
1627 if (length != 2) { 1624 if (length != 2) {
1628 dev_dbg(dev, "%s - expecting packet of size 2, got %d\n", __func__, length); 1625 dev_dbg(dev, "%s - expecting packet of size 2, got %d\n", __func__, length);
@@ -1726,7 +1723,7 @@ static void edge_bulk_in_callback(struct urb *urb)
1726 1723
1727 tty = tty_port_tty_get(&edge_port->port->port); 1724 tty = tty_port_tty_get(&edge_port->port->port);
1728 if (tty && urb->actual_length) { 1725 if (tty && urb->actual_length) {
1729 usb_serial_debug_data(debug, dev, __func__, urb->actual_length, data); 1726 usb_serial_debug_data(dev, __func__, urb->actual_length, data);
1730 if (edge_port->close_pending) 1727 if (edge_port->close_pending)
1731 dev_dbg(dev, "%s - close pending, dropping data on the floor\n", 1728 dev_dbg(dev, "%s - close pending, dropping data on the floor\n",
1732 __func__); 1729 __func__);
@@ -2059,8 +2056,7 @@ static void edge_send(struct tty_struct *tty)
2059 2056
2060 spin_unlock_irqrestore(&edge_port->ep_lock, flags); 2057 spin_unlock_irqrestore(&edge_port->ep_lock, flags);
2061 2058
2062 usb_serial_debug_data(debug, &port->dev, __func__, count, 2059 usb_serial_debug_data(&port->dev, __func__, count, port->write_urb->transfer_buffer);
2063 port->write_urb->transfer_buffer);
2064 2060
2065 /* set up our urb */ 2061 /* set up our urb */
2066 port->write_urb->transfer_buffer_length = count; 2062 port->write_urb->transfer_buffer_length = count;