aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-03 19:40:45 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-03 19:40:45 -0400
commit4d9b4001e0cb180b8e1c9ffd7bb4372e48f207c6 (patch)
tree4cb32bb40de8465f9c5231f84c07572490473908 /drivers/usb/serial
parentd8789b2b90aeb53ce59ac232d2ff0d8357d53893 (diff)
USB: serial: visor: convert dbg() to dev_dbg()
This removes most of the dbg() calls, as they were just tracing calls, and converts the remaining ones to dev_dbg(). Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/visor.c26
1 files changed, 5 insertions, 21 deletions
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index aa8911dc4154..d9b41fa50203 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -239,8 +239,6 @@ static int visor_open(struct tty_struct *tty, struct usb_serial_port *port)
239{ 239{
240 int result = 0; 240 int result = 0;
241 241
242 dbg("%s - port %d", __func__, port->number);
243
244 if (!port->read_urb) { 242 if (!port->read_urb) {
245 /* this is needed for some brain dead Sony devices */ 243 /* this is needed for some brain dead Sony devices */
246 dev_err(&port->dev, "Device lied about number of ports, please use a lower one.\n"); 244 dev_err(&port->dev, "Device lied about number of ports, please use a lower one.\n");
@@ -253,7 +251,7 @@ static int visor_open(struct tty_struct *tty, struct usb_serial_port *port)
253 goto exit; 251 goto exit;
254 252
255 if (port->interrupt_in_urb) { 253 if (port->interrupt_in_urb) {
256 dbg("%s - adding interrupt input for treo", __func__); 254 dev_dbg(&port->dev, "adding interrupt input for treo\n");
257 result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); 255 result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
258 if (result) 256 if (result)
259 dev_err(&port->dev, 257 dev_err(&port->dev,
@@ -269,8 +267,6 @@ static void visor_close(struct usb_serial_port *port)
269{ 267{
270 unsigned char *transfer_buffer; 268 unsigned char *transfer_buffer;
271 269
272 dbg("%s - port %d", __func__, port->number);
273
274 /* shutdown our urbs */ 270 /* shutdown our urbs */
275 usb_serial_generic_close(port); 271 usb_serial_generic_close(port);
276 usb_kill_urb(port->interrupt_in_urb); 272 usb_kill_urb(port->interrupt_in_urb);
@@ -305,12 +301,12 @@ static void visor_read_int_callback(struct urb *urb)
305 case -ENOENT: 301 case -ENOENT:
306 case -ESHUTDOWN: 302 case -ESHUTDOWN:
307 /* this urb is terminated, clean up */ 303 /* this urb is terminated, clean up */
308 dbg("%s - urb shutting down with status: %d", 304 dev_dbg(&port->dev, "%s - urb shutting down with status: %d\n",
309 __func__, status); 305 __func__, status);
310 return; 306 return;
311 default: 307 default:
312 dbg("%s - nonzero urb status received: %d", 308 dev_dbg(&port->dev, "%s - nonzero urb status received: %d\n",
313 __func__, status); 309 __func__, status);
314 goto exit; 310 goto exit;
315 } 311 }
316 312
@@ -343,8 +339,6 @@ static int palm_os_3_probe(struct usb_serial *serial,
343 int i; 339 int i;
344 int num_ports = 0; 340 int num_ports = 0;
345 341
346 dbg("%s", __func__);
347
348 transfer_buffer = kmalloc(sizeof(*connection_info), GFP_KERNEL); 342 transfer_buffer = kmalloc(sizeof(*connection_info), GFP_KERNEL);
349 if (!transfer_buffer) { 343 if (!transfer_buffer) {
350 dev_err(dev, "%s - kmalloc(%Zd) failed.\n", __func__, 344 dev_err(dev, "%s - kmalloc(%Zd) failed.\n", __func__,
@@ -440,8 +434,6 @@ static int palm_os_4_probe(struct usb_serial *serial,
440 unsigned char *transfer_buffer; 434 unsigned char *transfer_buffer;
441 int retval; 435 int retval;
442 436
443 dbg("%s", __func__);
444
445 transfer_buffer = kmalloc(sizeof(*connection_info), GFP_KERNEL); 437 transfer_buffer = kmalloc(sizeof(*connection_info), GFP_KERNEL);
446 if (!transfer_buffer) { 438 if (!transfer_buffer) {
447 dev_err(dev, "%s - kmalloc(%Zd) failed.\n", __func__, 439 dev_err(dev, "%s - kmalloc(%Zd) failed.\n", __func__,
@@ -473,8 +465,6 @@ static int visor_probe(struct usb_serial *serial,
473 int (*startup)(struct usb_serial *serial, 465 int (*startup)(struct usb_serial *serial,
474 const struct usb_device_id *id); 466 const struct usb_device_id *id);
475 467
476 dbg("%s", __func__);
477
478 /* 468 /*
479 * some Samsung Android phones in modem mode have the same ID 469 * some Samsung Android phones in modem mode have the same ID
480 * as SPH-I500, but they are ACM devices, so dont bind to them 470 * as SPH-I500, but they are ACM devices, so dont bind to them
@@ -516,8 +506,6 @@ static int clie_3_5_startup(struct usb_serial *serial)
516 int result; 506 int result;
517 u8 *data; 507 u8 *data;
518 508
519 dbg("%s", __func__);
520
521 data = kmalloc(1, GFP_KERNEL); 509 data = kmalloc(1, GFP_KERNEL);
522 if (!data) 510 if (!data)
523 return -ENOMEM; 511 return -ENOMEM;
@@ -580,8 +568,6 @@ static int treo_attach(struct usb_serial *serial)
580 (serial->num_interrupt_in == 0)) 568 (serial->num_interrupt_in == 0))
581 return 0; 569 return 0;
582 570
583 dbg("%s", __func__);
584
585 /* 571 /*
586 * It appears that Treos and Kyoceras want to use the 572 * It appears that Treos and Kyoceras want to use the
587 * 1st bulk in endpoint to communicate with the 2nd bulk out endpoint, 573 * 1st bulk in endpoint to communicate with the 2nd bulk out endpoint,
@@ -617,8 +603,6 @@ static int clie_5_attach(struct usb_serial *serial)
617 unsigned int pipe; 603 unsigned int pipe;
618 int j; 604 int j;
619 605
620 dbg("%s", __func__);
621
622 /* TH55 registers 2 ports. 606 /* TH55 registers 2 ports.
623 Communication in from the UX50/TH55 uses bulk_in_endpointAddress 607 Communication in from the UX50/TH55 uses bulk_in_endpointAddress
624 from port 0. Communication out to the UX50/TH55 uses 608 from port 0. Communication out to the UX50/TH55 uses