diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-03 19:43:58 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-03 19:43:58 -0400 |
commit | 108feb66ac273ab0f949a3f78526dc0c03ee9d87 (patch) | |
tree | a6497830548d0acafe74fe534e98e780a8ea2515 /drivers/usb/serial | |
parent | b627488c19451439de9ec8a7bf2fa1649110fc1b (diff) |
USB: cypress_m8.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: Lonnie Mendez <dignome@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/cypress_m8.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index afc886c75d2f..6fac26c5fd53 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
@@ -305,8 +305,6 @@ static int cypress_serial_control(struct tty_struct *tty, | |||
305 | const unsigned int feature_len = 5; | 305 | const unsigned int feature_len = 5; |
306 | unsigned long flags; | 306 | unsigned long flags; |
307 | 307 | ||
308 | dbg("%s", __func__); | ||
309 | |||
310 | priv = usb_get_serial_port_data(port); | 308 | priv = usb_get_serial_port_data(port); |
311 | 309 | ||
312 | if (!priv->comm_is_ok) | 310 | if (!priv->comm_is_ok) |
@@ -451,8 +449,6 @@ static int generic_startup(struct usb_serial *serial) | |||
451 | struct cypress_private *priv; | 449 | struct cypress_private *priv; |
452 | struct usb_serial_port *port = serial->port[0]; | 450 | struct usb_serial_port *port = serial->port[0]; |
453 | 451 | ||
454 | dbg("%s - port %d", __func__, port->number); | ||
455 | |||
456 | priv = kzalloc(sizeof(struct cypress_private), GFP_KERNEL); | 452 | priv = kzalloc(sizeof(struct cypress_private), GFP_KERNEL); |
457 | if (!priv) | 453 | if (!priv) |
458 | return -ENOMEM; | 454 | return -ENOMEM; |
@@ -505,8 +501,6 @@ static int cypress_earthmate_startup(struct usb_serial *serial) | |||
505 | struct cypress_private *priv; | 501 | struct cypress_private *priv; |
506 | struct usb_serial_port *port = serial->port[0]; | 502 | struct usb_serial_port *port = serial->port[0]; |
507 | 503 | ||
508 | dbg("%s", __func__); | ||
509 | |||
510 | if (generic_startup(serial)) { | 504 | if (generic_startup(serial)) { |
511 | dbg("%s - Failed setting up port %d", __func__, | 505 | dbg("%s - Failed setting up port %d", __func__, |
512 | port->number); | 506 | port->number); |
@@ -537,8 +531,6 @@ static int cypress_hidcom_startup(struct usb_serial *serial) | |||
537 | { | 531 | { |
538 | struct cypress_private *priv; | 532 | struct cypress_private *priv; |
539 | 533 | ||
540 | dbg("%s", __func__); | ||
541 | |||
542 | if (generic_startup(serial)) { | 534 | if (generic_startup(serial)) { |
543 | dbg("%s - Failed setting up port %d", __func__, | 535 | dbg("%s - Failed setting up port %d", __func__, |
544 | serial->port[0]->number); | 536 | serial->port[0]->number); |
@@ -556,8 +548,6 @@ static int cypress_ca42v2_startup(struct usb_serial *serial) | |||
556 | { | 548 | { |
557 | struct cypress_private *priv; | 549 | struct cypress_private *priv; |
558 | 550 | ||
559 | dbg("%s", __func__); | ||
560 | |||
561 | if (generic_startup(serial)) { | 551 | if (generic_startup(serial)) { |
562 | dbg("%s - Failed setting up port %d", __func__, | 552 | dbg("%s - Failed setting up port %d", __func__, |
563 | serial->port[0]->number); | 553 | serial->port[0]->number); |
@@ -575,10 +565,7 @@ static void cypress_release(struct usb_serial *serial) | |||
575 | { | 565 | { |
576 | struct cypress_private *priv; | 566 | struct cypress_private *priv; |
577 | 567 | ||
578 | dbg("%s - port %d", __func__, serial->port[0]->number); | ||
579 | |||
580 | /* all open ports are closed at this point */ | 568 | /* all open ports are closed at this point */ |
581 | |||
582 | priv = usb_get_serial_port_data(serial->port[0]); | 569 | priv = usb_get_serial_port_data(serial->port[0]); |
583 | 570 | ||
584 | if (priv) { | 571 | if (priv) { |
@@ -595,8 +582,6 @@ static int cypress_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
595 | unsigned long flags; | 582 | unsigned long flags; |
596 | int result = 0; | 583 | int result = 0; |
597 | 584 | ||
598 | dbg("%s - port %d", __func__, port->number); | ||
599 | |||
600 | if (!priv->comm_is_ok) | 585 | if (!priv->comm_is_ok) |
601 | return -EIO; | 586 | return -EIO; |
602 | 587 | ||
@@ -661,8 +646,6 @@ static void cypress_close(struct usb_serial_port *port) | |||
661 | struct cypress_private *priv = usb_get_serial_port_data(port); | 646 | struct cypress_private *priv = usb_get_serial_port_data(port); |
662 | unsigned long flags; | 647 | unsigned long flags; |
663 | 648 | ||
664 | dbg("%s - port %d", __func__, port->number); | ||
665 | |||
666 | /* writing is potentially harmful, lock must be taken */ | 649 | /* writing is potentially harmful, lock must be taken */ |
667 | mutex_lock(&port->serial->disc_mutex); | 650 | mutex_lock(&port->serial->disc_mutex); |
668 | if (port->serial->disconnected) { | 651 | if (port->serial->disconnected) { |
@@ -720,7 +703,6 @@ static void cypress_send(struct usb_serial_port *port) | |||
720 | if (!priv->comm_is_ok) | 703 | if (!priv->comm_is_ok) |
721 | return; | 704 | return; |
722 | 705 | ||
723 | dbg("%s - port %d", __func__, port->number); | ||
724 | dbg("%s - interrupt out size is %d", __func__, | 706 | dbg("%s - interrupt out size is %d", __func__, |
725 | port->interrupt_out_size); | 707 | port->interrupt_out_size); |
726 | 708 | ||
@@ -828,8 +810,6 @@ static int cypress_write_room(struct tty_struct *tty) | |||
828 | int room = 0; | 810 | int room = 0; |
829 | unsigned long flags; | 811 | unsigned long flags; |
830 | 812 | ||
831 | dbg("%s - port %d", __func__, port->number); | ||
832 | |||
833 | spin_lock_irqsave(&priv->lock, flags); | 813 | spin_lock_irqsave(&priv->lock, flags); |
834 | room = kfifo_avail(&priv->write_fifo); | 814 | room = kfifo_avail(&priv->write_fifo); |
835 | spin_unlock_irqrestore(&priv->lock, flags); | 815 | spin_unlock_irqrestore(&priv->lock, flags); |
@@ -847,8 +827,6 @@ static int cypress_tiocmget(struct tty_struct *tty) | |||
847 | unsigned int result = 0; | 827 | unsigned int result = 0; |
848 | unsigned long flags; | 828 | unsigned long flags; |
849 | 829 | ||
850 | dbg("%s - port %d", __func__, port->number); | ||
851 | |||
852 | spin_lock_irqsave(&priv->lock, flags); | 830 | spin_lock_irqsave(&priv->lock, flags); |
853 | control = priv->line_control; | 831 | control = priv->line_control; |
854 | status = priv->current_status; | 832 | status = priv->current_status; |
@@ -874,8 +852,6 @@ static int cypress_tiocmset(struct tty_struct *tty, | |||
874 | struct cypress_private *priv = usb_get_serial_port_data(port); | 852 | struct cypress_private *priv = usb_get_serial_port_data(port); |
875 | unsigned long flags; | 853 | unsigned long flags; |
876 | 854 | ||
877 | dbg("%s - port %d", __func__, port->number); | ||
878 | |||
879 | spin_lock_irqsave(&priv->lock, flags); | 855 | spin_lock_irqsave(&priv->lock, flags); |
880 | if (set & TIOCM_RTS) | 856 | if (set & TIOCM_RTS) |
881 | priv->line_control |= CONTROL_RTS; | 857 | priv->line_control |= CONTROL_RTS; |
@@ -948,8 +924,6 @@ static void cypress_set_termios(struct tty_struct *tty, | |||
948 | __u8 oldlines; | 924 | __u8 oldlines; |
949 | int linechange = 0; | 925 | int linechange = 0; |
950 | 926 | ||
951 | dbg("%s - port %d", __func__, port->number); | ||
952 | |||
953 | spin_lock_irqsave(&priv->lock, flags); | 927 | spin_lock_irqsave(&priv->lock, flags); |
954 | /* We can't clean this one up as we don't know the device type | 928 | /* We can't clean this one up as we don't know the device type |
955 | early enough */ | 929 | early enough */ |
@@ -1096,8 +1070,6 @@ static int cypress_chars_in_buffer(struct tty_struct *tty) | |||
1096 | int chars = 0; | 1070 | int chars = 0; |
1097 | unsigned long flags; | 1071 | unsigned long flags; |
1098 | 1072 | ||
1099 | dbg("%s - port %d", __func__, port->number); | ||
1100 | |||
1101 | spin_lock_irqsave(&priv->lock, flags); | 1073 | spin_lock_irqsave(&priv->lock, flags); |
1102 | chars = kfifo_len(&priv->write_fifo); | 1074 | chars = kfifo_len(&priv->write_fifo); |
1103 | spin_unlock_irqrestore(&priv->lock, flags); | 1075 | spin_unlock_irqrestore(&priv->lock, flags); |
@@ -1112,8 +1084,6 @@ static void cypress_throttle(struct tty_struct *tty) | |||
1112 | struct usb_serial_port *port = tty->driver_data; | 1084 | struct usb_serial_port *port = tty->driver_data; |
1113 | struct cypress_private *priv = usb_get_serial_port_data(port); | 1085 | struct cypress_private *priv = usb_get_serial_port_data(port); |
1114 | 1086 | ||
1115 | dbg("%s - port %d", __func__, port->number); | ||
1116 | |||
1117 | spin_lock_irq(&priv->lock); | 1087 | spin_lock_irq(&priv->lock); |
1118 | priv->rx_flags = THROTTLED; | 1088 | priv->rx_flags = THROTTLED; |
1119 | spin_unlock_irq(&priv->lock); | 1089 | spin_unlock_irq(&priv->lock); |
@@ -1126,8 +1096,6 @@ static void cypress_unthrottle(struct tty_struct *tty) | |||
1126 | struct cypress_private *priv = usb_get_serial_port_data(port); | 1096 | struct cypress_private *priv = usb_get_serial_port_data(port); |
1127 | int actually_throttled, result; | 1097 | int actually_throttled, result; |
1128 | 1098 | ||
1129 | dbg("%s - port %d", __func__, port->number); | ||
1130 | |||
1131 | spin_lock_irq(&priv->lock); | 1099 | spin_lock_irq(&priv->lock); |
1132 | actually_throttled = priv->rx_flags & ACTUALLY_THROTTLED; | 1100 | actually_throttled = priv->rx_flags & ACTUALLY_THROTTLED; |
1133 | priv->rx_flags = 0; | 1101 | priv->rx_flags = 0; |
@@ -1161,8 +1129,6 @@ static void cypress_read_int_callback(struct urb *urb) | |||
1161 | int i = 0; | 1129 | int i = 0; |
1162 | int status = urb->status; | 1130 | int status = urb->status; |
1163 | 1131 | ||
1164 | dbg("%s - port %d", __func__, port->number); | ||
1165 | |||
1166 | switch (status) { | 1132 | switch (status) { |
1167 | case 0: /* success */ | 1133 | case 0: /* success */ |
1168 | break; | 1134 | break; |
@@ -1303,8 +1269,6 @@ static void cypress_write_int_callback(struct urb *urb) | |||
1303 | int result; | 1269 | int result; |
1304 | int status = urb->status; | 1270 | int status = urb->status; |
1305 | 1271 | ||
1306 | dbg("%s - port %d", __func__, port->number); | ||
1307 | |||
1308 | switch (status) { | 1272 | switch (status) { |
1309 | case 0: | 1273 | case 0: |
1310 | /* success */ | 1274 | /* success */ |