diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-03 19:44:58 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-03 19:44:58 -0400 |
commit | 4a7ce90c0a8160af6480836636ad7eb67c8e07dc (patch) | |
tree | c5ecd2ccb923e725795a27aabdb84a44ee489732 /drivers | |
parent | b6b6df8a568678ca086e9ed558352d762b018c6c (diff) |
USB: ti_usb_3410_5052.c: remove dbg() tracing calls
dbg() was used a lot a long time ago to trace code flow. Now that we have
ftrace, this isn't needed at all, so remove these calls.
CC: Johan Hovold <jhovold@gmail.com>
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Adhir Ramjiawan <adhirramjiawan0@gmail.com>
CC: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/ti_usb_3410_5052.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index 82116f42e6fd..925f5f407cc5 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |||
@@ -465,8 +465,6 @@ static void ti_release(struct usb_serial *serial) | |||
465 | struct ti_device *tdev = usb_get_serial_data(serial); | 465 | struct ti_device *tdev = usb_get_serial_data(serial); |
466 | struct ti_port *tport; | 466 | struct ti_port *tport; |
467 | 467 | ||
468 | dbg("%s", __func__); | ||
469 | |||
470 | for (i = 0; i < serial->num_ports; ++i) { | 468 | for (i = 0; i < serial->num_ports; ++i) { |
471 | tport = usb_get_serial_port_data(serial->port[i]); | 469 | tport = usb_get_serial_port_data(serial->port[i]); |
472 | if (tport) { | 470 | if (tport) { |
@@ -491,8 +489,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
491 | TI_PIPE_TIMEOUT_ENABLE | | 489 | TI_PIPE_TIMEOUT_ENABLE | |
492 | (TI_TRANSFER_TIMEOUT << 2)); | 490 | (TI_TRANSFER_TIMEOUT << 2)); |
493 | 491 | ||
494 | dbg("%s - port %d", __func__, port->number); | ||
495 | |||
496 | if (tport == NULL) | 492 | if (tport == NULL) |
497 | return -ENODEV; | 493 | return -ENODEV; |
498 | 494 | ||
@@ -633,8 +629,6 @@ static void ti_close(struct usb_serial_port *port) | |||
633 | int status; | 629 | int status; |
634 | int do_unlock; | 630 | int do_unlock; |
635 | 631 | ||
636 | dbg("%s - port %d", __func__, port->number); | ||
637 | |||
638 | tdev = usb_get_serial_data(port->serial); | 632 | tdev = usb_get_serial_data(port->serial); |
639 | tport = usb_get_serial_port_data(port); | 633 | tport = usb_get_serial_port_data(port); |
640 | if (tdev == NULL || tport == NULL) | 634 | if (tdev == NULL || tport == NULL) |
@@ -668,8 +662,6 @@ static void ti_close(struct usb_serial_port *port) | |||
668 | } | 662 | } |
669 | if (do_unlock) | 663 | if (do_unlock) |
670 | mutex_unlock(&tdev->td_open_close_lock); | 664 | mutex_unlock(&tdev->td_open_close_lock); |
671 | |||
672 | dbg("%s - exit", __func__); | ||
673 | } | 665 | } |
674 | 666 | ||
675 | 667 | ||
@@ -678,8 +670,6 @@ static int ti_write(struct tty_struct *tty, struct usb_serial_port *port, | |||
678 | { | 670 | { |
679 | struct ti_port *tport = usb_get_serial_port_data(port); | 671 | struct ti_port *tport = usb_get_serial_port_data(port); |
680 | 672 | ||
681 | dbg("%s - port %d", __func__, port->number); | ||
682 | |||
683 | if (count == 0) { | 673 | if (count == 0) { |
684 | dbg("%s - write request of 0 bytes", __func__); | 674 | dbg("%s - write request of 0 bytes", __func__); |
685 | return 0; | 675 | return 0; |
@@ -703,8 +693,6 @@ static int ti_write_room(struct tty_struct *tty) | |||
703 | int room = 0; | 693 | int room = 0; |
704 | unsigned long flags; | 694 | unsigned long flags; |
705 | 695 | ||
706 | dbg("%s - port %d", __func__, port->number); | ||
707 | |||
708 | if (tport == NULL) | 696 | if (tport == NULL) |
709 | return 0; | 697 | return 0; |
710 | 698 | ||
@@ -724,8 +712,6 @@ static int ti_chars_in_buffer(struct tty_struct *tty) | |||
724 | int chars = 0; | 712 | int chars = 0; |
725 | unsigned long flags; | 713 | unsigned long flags; |
726 | 714 | ||
727 | dbg("%s - port %d", __func__, port->number); | ||
728 | |||
729 | if (tport == NULL) | 715 | if (tport == NULL) |
730 | return 0; | 716 | return 0; |
731 | 717 | ||
@@ -743,8 +729,6 @@ static void ti_throttle(struct tty_struct *tty) | |||
743 | struct usb_serial_port *port = tty->driver_data; | 729 | struct usb_serial_port *port = tty->driver_data; |
744 | struct ti_port *tport = usb_get_serial_port_data(port); | 730 | struct ti_port *tport = usb_get_serial_port_data(port); |
745 | 731 | ||
746 | dbg("%s - port %d", __func__, port->number); | ||
747 | |||
748 | if (tport == NULL) | 732 | if (tport == NULL) |
749 | return; | 733 | return; |
750 | 734 | ||
@@ -760,8 +744,6 @@ static void ti_unthrottle(struct tty_struct *tty) | |||
760 | struct ti_port *tport = usb_get_serial_port_data(port); | 744 | struct ti_port *tport = usb_get_serial_port_data(port); |
761 | int status; | 745 | int status; |
762 | 746 | ||
763 | dbg("%s - port %d", __func__, port->number); | ||
764 | |||
765 | if (tport == NULL) | 747 | if (tport == NULL) |
766 | return; | 748 | return; |
767 | 749 | ||
@@ -856,8 +838,6 @@ static void ti_set_termios(struct tty_struct *tty, | |||
856 | int port_number = port->number - port->serial->minor; | 838 | int port_number = port->number - port->serial->minor; |
857 | unsigned int mcr; | 839 | unsigned int mcr; |
858 | 840 | ||
859 | dbg("%s - port %d", __func__, port->number); | ||
860 | |||
861 | cflag = tty->termios->c_cflag; | 841 | cflag = tty->termios->c_cflag; |
862 | iflag = tty->termios->c_iflag; | 842 | iflag = tty->termios->c_iflag; |
863 | 843 | ||
@@ -990,8 +970,6 @@ static int ti_tiocmget(struct tty_struct *tty) | |||
990 | unsigned int mcr; | 970 | unsigned int mcr; |
991 | unsigned long flags; | 971 | unsigned long flags; |
992 | 972 | ||
993 | dbg("%s - port %d", __func__, port->number); | ||
994 | |||
995 | if (tport == NULL) | 973 | if (tport == NULL) |
996 | return -ENODEV; | 974 | return -ENODEV; |
997 | 975 | ||
@@ -1022,8 +1000,6 @@ static int ti_tiocmset(struct tty_struct *tty, | |||
1022 | unsigned int mcr; | 1000 | unsigned int mcr; |
1023 | unsigned long flags; | 1001 | unsigned long flags; |
1024 | 1002 | ||
1025 | dbg("%s - port %d", __func__, port->number); | ||
1026 | |||
1027 | if (tport == NULL) | 1003 | if (tport == NULL) |
1028 | return -ENODEV; | 1004 | return -ENODEV; |
1029 | 1005 | ||
@@ -1086,8 +1062,6 @@ static void ti_interrupt_callback(struct urb *urb) | |||
1086 | int retval; | 1062 | int retval; |
1087 | __u8 msr; | 1063 | __u8 msr; |
1088 | 1064 | ||
1089 | dbg("%s", __func__); | ||
1090 | |||
1091 | switch (status) { | 1065 | switch (status) { |
1092 | case 0: | 1066 | case 0: |
1093 | break; | 1067 | break; |
@@ -1167,8 +1141,6 @@ static void ti_bulk_in_callback(struct urb *urb) | |||
1167 | int retval = 0; | 1141 | int retval = 0; |
1168 | struct tty_struct *tty; | 1142 | struct tty_struct *tty; |
1169 | 1143 | ||
1170 | dbg("%s", __func__); | ||
1171 | |||
1172 | switch (status) { | 1144 | switch (status) { |
1173 | case 0: | 1145 | case 0: |
1174 | break; | 1146 | break; |
@@ -1235,8 +1207,6 @@ static void ti_bulk_out_callback(struct urb *urb) | |||
1235 | struct usb_serial_port *port = tport->tp_port; | 1207 | struct usb_serial_port *port = tport->tp_port; |
1236 | int status = urb->status; | 1208 | int status = urb->status; |
1237 | 1209 | ||
1238 | dbg("%s - port %d", __func__, port->number); | ||
1239 | |||
1240 | tport->tp_write_urb_in_use = 0; | 1210 | tport->tp_write_urb_in_use = 0; |
1241 | 1211 | ||
1242 | switch (status) { | 1212 | switch (status) { |
@@ -1289,9 +1259,6 @@ static void ti_send(struct ti_port *tport) | |||
1289 | struct tty_struct *tty = tty_port_tty_get(&port->port); /* FIXME */ | 1259 | struct tty_struct *tty = tty_port_tty_get(&port->port); /* FIXME */ |
1290 | unsigned long flags; | 1260 | unsigned long flags; |
1291 | 1261 | ||
1292 | |||
1293 | dbg("%s - port %d", __func__, port->number); | ||
1294 | |||
1295 | spin_lock_irqsave(&tport->tp_lock, flags); | 1262 | spin_lock_irqsave(&tport->tp_lock, flags); |
1296 | 1263 | ||
1297 | if (tport->tp_write_urb_in_use) | 1264 | if (tport->tp_write_urb_in_use) |
@@ -1368,8 +1335,6 @@ static int ti_get_lsr(struct ti_port *tport) | |||
1368 | int port_number = port->number - port->serial->minor; | 1335 | int port_number = port->number - port->serial->minor; |
1369 | struct ti_port_status *data; | 1336 | struct ti_port_status *data; |
1370 | 1337 | ||
1371 | dbg("%s - port %d", __func__, port->number); | ||
1372 | |||
1373 | size = sizeof(struct ti_port_status); | 1338 | size = sizeof(struct ti_port_status); |
1374 | data = kmalloc(size, GFP_KERNEL); | 1339 | data = kmalloc(size, GFP_KERNEL); |
1375 | if (!data) { | 1340 | if (!data) { |
@@ -1482,8 +1447,6 @@ static void ti_drain(struct ti_port *tport, unsigned long timeout, int flush) | |||
1482 | struct usb_serial_port *port = tport->tp_port; | 1447 | struct usb_serial_port *port = tport->tp_port; |
1483 | wait_queue_t wait; | 1448 | wait_queue_t wait; |
1484 | 1449 | ||
1485 | dbg("%s - port %d", __func__, port->number); | ||
1486 | |||
1487 | spin_lock_irq(&tport->tp_lock); | 1450 | spin_lock_irq(&tport->tp_lock); |
1488 | 1451 | ||
1489 | /* wait for data to drain from the buffer */ | 1452 | /* wait for data to drain from the buffer */ |
@@ -1681,7 +1644,6 @@ static int ti_download_firmware(struct ti_device *tdev) | |||
1681 | const struct firmware *fw_p; | 1644 | const struct firmware *fw_p; |
1682 | char buf[32]; | 1645 | char buf[32]; |
1683 | 1646 | ||
1684 | dbg("%s\n", __func__); | ||
1685 | /* try ID specific firmware first, then try generic firmware */ | 1647 | /* try ID specific firmware first, then try generic firmware */ |
1686 | sprintf(buf, "ti_usb-v%04x-p%04x.fw", dev->descriptor.idVendor, | 1648 | sprintf(buf, "ti_usb-v%04x-p%04x.fw", dev->descriptor.idVendor, |
1687 | dev->descriptor.idProduct); | 1649 | dev->descriptor.idProduct); |