aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/class
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2016-09-07 08:30:01 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-09 08:13:24 -0400
commitab57f86198d6ff20371613d4a02fd4841972a5c0 (patch)
tree99bb8ebdc806b0497b74b21a1c29c3f8508b4570 /drivers/usb/class
parentce8bb344dffb493fbc80027a28d4f03c029d775e (diff)
cdc-acm: delete obsolete debug messages
Some debug messages merely provide a function trace without additional debug data. They predate ftrace and can be replaced by it. Drop them without replacement. Signed-off-by: Oliver Neukum <oneukum@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class')
-rw-r--r--drivers/usb/class/cdc-acm.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 0f3f62e81e5b..fef0d8fcd916 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -492,8 +492,6 @@ static int acm_tty_install(struct tty_driver *driver, struct tty_struct *tty)
492 struct acm *acm; 492 struct acm *acm;
493 int retval; 493 int retval;
494 494
495 dev_dbg(tty->dev, "%s\n", __func__);
496
497 acm = acm_get_by_minor(tty->index); 495 acm = acm_get_by_minor(tty->index);
498 if (!acm) 496 if (!acm)
499 return -ENODEV; 497 return -ENODEV;
@@ -515,8 +513,6 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
515{ 513{
516 struct acm *acm = tty->driver_data; 514 struct acm *acm = tty->driver_data;
517 515
518 dev_dbg(tty->dev, "%s\n", __func__);
519
520 return tty_port_open(&acm->port, tty, filp); 516 return tty_port_open(&acm->port, tty, filp);
521} 517}
522 518
@@ -545,8 +541,6 @@ static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
545 int retval = -ENODEV; 541 int retval = -ENODEV;
546 int i; 542 int i;
547 543
548 dev_dbg(&acm->control->dev, "%s\n", __func__);
549
550 mutex_lock(&acm->mutex); 544 mutex_lock(&acm->mutex);
551 if (acm->disconnected) 545 if (acm->disconnected)
552 goto disconnected; 546 goto disconnected;
@@ -607,8 +601,6 @@ static void acm_port_destruct(struct tty_port *port)
607{ 601{
608 struct acm *acm = container_of(port, struct acm, port); 602 struct acm *acm = container_of(port, struct acm, port);
609 603
610 dev_dbg(&acm->control->dev, "%s\n", __func__);
611
612 acm_release_minor(acm); 604 acm_release_minor(acm);
613 usb_put_intf(acm->control); 605 usb_put_intf(acm->control);
614 kfree(acm->country_codes); 606 kfree(acm->country_codes);
@@ -622,8 +614,6 @@ static void acm_port_shutdown(struct tty_port *port)
622 struct acm_wb *wb; 614 struct acm_wb *wb;
623 int i; 615 int i;
624 616
625 dev_dbg(&acm->control->dev, "%s\n", __func__);
626
627 /* 617 /*
628 * Need to grab write_lock to prevent race with resume, but no need to 618 * Need to grab write_lock to prevent race with resume, but no need to
629 * hold it due to the tty-port initialised flag. 619 * hold it due to the tty-port initialised flag.
@@ -654,21 +644,21 @@ static void acm_port_shutdown(struct tty_port *port)
654static void acm_tty_cleanup(struct tty_struct *tty) 644static void acm_tty_cleanup(struct tty_struct *tty)
655{ 645{
656 struct acm *acm = tty->driver_data; 646 struct acm *acm = tty->driver_data;
657 dev_dbg(&acm->control->dev, "%s\n", __func__); 647
658 tty_port_put(&acm->port); 648 tty_port_put(&acm->port);
659} 649}
660 650
661static void acm_tty_hangup(struct tty_struct *tty) 651static void acm_tty_hangup(struct tty_struct *tty)
662{ 652{
663 struct acm *acm = tty->driver_data; 653 struct acm *acm = tty->driver_data;
664 dev_dbg(&acm->control->dev, "%s\n", __func__); 654
665 tty_port_hangup(&acm->port); 655 tty_port_hangup(&acm->port);
666} 656}
667 657
668static void acm_tty_close(struct tty_struct *tty, struct file *filp) 658static void acm_tty_close(struct tty_struct *tty, struct file *filp)
669{ 659{
670 struct acm *acm = tty->driver_data; 660 struct acm *acm = tty->driver_data;
671 dev_dbg(&acm->control->dev, "%s\n", __func__); 661
672 tty_port_close(&acm->port, tty, filp); 662 tty_port_close(&acm->port, tty, filp);
673} 663}
674 664
@@ -1533,8 +1523,6 @@ static void stop_data_traffic(struct acm *acm)
1533{ 1523{
1534 int i; 1524 int i;
1535 1525
1536 dev_dbg(&acm->control->dev, "%s\n", __func__);
1537
1538 usb_kill_urb(acm->ctrlurb); 1526 usb_kill_urb(acm->ctrlurb);
1539 for (i = 0; i < ACM_NW; i++) 1527 for (i = 0; i < ACM_NW; i++)
1540 usb_kill_urb(acm->wb[i].urb); 1528 usb_kill_urb(acm->wb[i].urb);
@@ -1551,8 +1539,6 @@ static void acm_disconnect(struct usb_interface *intf)
1551 struct tty_struct *tty; 1539 struct tty_struct *tty;
1552 int i; 1540 int i;
1553 1541
1554 dev_dbg(&intf->dev, "%s\n", __func__);
1555
1556 /* sibling interface is already cleaning up */ 1542 /* sibling interface is already cleaning up */
1557 if (!acm) 1543 if (!acm)
1558 return; 1544 return;