aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-03 19:44:10 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-03 19:44:10 -0400
commita09aa7dda46b2beb157d3a360898bdd77566d3e7 (patch)
tree6de9d540b1db42024791a07a53651795d58ec2e3 /drivers/usb/serial
parentb6ea163b6d784e92266f33936d096f7dc83d7b22 (diff)
USB: ftdi_sio.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: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> CC: Simon Arlott <simon@fire.lp0.eu> CC: Andrew Worsley <amworsley@gmail.com> CC: "Michał Wróbel" <michal.wrobel@flytronic.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/ftdi_sio.c35
1 files changed, 1 insertions, 34 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 02e7f2d32d52..5691b8be0c77 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1285,8 +1285,6 @@ static int read_latency_timer(struct usb_serial_port *port)
1285 unsigned char *buf; 1285 unsigned char *buf;
1286 int rv; 1286 int rv;
1287 1287
1288 dbg("%s", __func__);
1289
1290 buf = kmalloc(1, GFP_KERNEL); 1288 buf = kmalloc(1, GFP_KERNEL);
1291 if (!buf) 1289 if (!buf)
1292 return -ENOMEM; 1290 return -ENOMEM;
@@ -1593,8 +1591,6 @@ static int create_sysfs_attrs(struct usb_serial_port *port)
1593 struct ftdi_private *priv = usb_get_serial_port_data(port); 1591 struct ftdi_private *priv = usb_get_serial_port_data(port);
1594 int retval = 0; 1592 int retval = 0;
1595 1593
1596 dbg("%s", __func__);
1597
1598 /* XXX I've no idea if the original SIO supports the event_char 1594 /* XXX I've no idea if the original SIO supports the event_char
1599 * sysfs parameter, so I'm playing it safe. */ 1595 * sysfs parameter, so I'm playing it safe. */
1600 if (priv->chip_type != SIO) { 1596 if (priv->chip_type != SIO) {
@@ -1619,8 +1615,6 @@ static void remove_sysfs_attrs(struct usb_serial_port *port)
1619{ 1615{
1620 struct ftdi_private *priv = usb_get_serial_port_data(port); 1616 struct ftdi_private *priv = usb_get_serial_port_data(port);
1621 1617
1622 dbg("%s", __func__);
1623
1624 /* XXX see create_sysfs_attrs */ 1618 /* XXX see create_sysfs_attrs */
1625 if (priv->chip_type != SIO) { 1619 if (priv->chip_type != SIO) {
1626 device_remove_file(&port->dev, &dev_attr_event_char); 1620 device_remove_file(&port->dev, &dev_attr_event_char);
@@ -1667,8 +1661,6 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port)
1667 struct ftdi_sio_quirk *quirk = usb_get_serial_data(port->serial); 1661 struct ftdi_sio_quirk *quirk = usb_get_serial_data(port->serial);
1668 1662
1669 1663
1670 dbg("%s", __func__);
1671
1672 priv = kzalloc(sizeof(struct ftdi_private), GFP_KERNEL); 1664 priv = kzalloc(sizeof(struct ftdi_private), GFP_KERNEL);
1673 if (!priv) { 1665 if (!priv) {
1674 dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n", __func__, 1666 dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n", __func__,
@@ -1704,8 +1696,6 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port)
1704/* Called from usbserial:serial_probe */ 1696/* Called from usbserial:serial_probe */
1705static void ftdi_USB_UIRT_setup(struct ftdi_private *priv) 1697static void ftdi_USB_UIRT_setup(struct ftdi_private *priv)
1706{ 1698{
1707 dbg("%s", __func__);
1708
1709 priv->flags |= ASYNC_SPD_CUST; 1699 priv->flags |= ASYNC_SPD_CUST;
1710 priv->custom_divisor = 77; 1700 priv->custom_divisor = 77;
1711 priv->force_baud = 38400; 1701 priv->force_baud = 38400;
@@ -1716,8 +1706,6 @@ static void ftdi_USB_UIRT_setup(struct ftdi_private *priv)
1716 1706
1717static void ftdi_HE_TIRA1_setup(struct ftdi_private *priv) 1707static void ftdi_HE_TIRA1_setup(struct ftdi_private *priv)
1718{ 1708{
1719 dbg("%s", __func__);
1720
1721 priv->flags |= ASYNC_SPD_CUST; 1709 priv->flags |= ASYNC_SPD_CUST;
1722 priv->custom_divisor = 240; 1710 priv->custom_divisor = 240;
1723 priv->force_baud = 38400; 1711 priv->force_baud = 38400;
@@ -1767,8 +1755,6 @@ static int ftdi_jtag_probe(struct usb_serial *serial)
1767 struct usb_device *udev = serial->dev; 1755 struct usb_device *udev = serial->dev;
1768 struct usb_interface *interface = serial->interface; 1756 struct usb_interface *interface = serial->interface;
1769 1757
1770 dbg("%s", __func__);
1771
1772 if (interface == udev->actconfig->interface[0]) { 1758 if (interface == udev->actconfig->interface[0]) {
1773 dev_info(&udev->dev, 1759 dev_info(&udev->dev,
1774 "Ignoring serial port reserved for JTAG\n"); 1760 "Ignoring serial port reserved for JTAG\n");
@@ -1782,8 +1768,6 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)
1782{ 1768{
1783 struct usb_device *udev = serial->dev; 1769 struct usb_device *udev = serial->dev;
1784 1770
1785 dbg("%s", __func__);
1786
1787 if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) || 1771 if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) ||
1788 (udev->product && !strcmp(udev->product, "BeagleBone/XDS100"))) 1772 (udev->product && !strcmp(udev->product, "BeagleBone/XDS100")))
1789 return ftdi_jtag_probe(serial); 1773 return ftdi_jtag_probe(serial);
@@ -1800,8 +1784,6 @@ static int ftdi_stmclite_probe(struct usb_serial *serial)
1800 struct usb_device *udev = serial->dev; 1784 struct usb_device *udev = serial->dev;
1801 struct usb_interface *interface = serial->interface; 1785 struct usb_interface *interface = serial->interface;
1802 1786
1803 dbg("%s", __func__);
1804
1805 if (interface == udev->actconfig->interface[2]) 1787 if (interface == udev->actconfig->interface[2])
1806 return 0; 1788 return 0;
1807 1789
@@ -1839,8 +1821,6 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port)
1839{ 1821{
1840 struct ftdi_private *priv = usb_get_serial_port_data(port); 1822 struct ftdi_private *priv = usb_get_serial_port_data(port);
1841 1823
1842 dbg("%s", __func__);
1843
1844 priv->dev_gone = true; 1824 priv->dev_gone = true;
1845 wake_up_interruptible_all(&priv->delta_msr_wait); 1825 wake_up_interruptible_all(&priv->delta_msr_wait);
1846 1826
@@ -1858,8 +1838,6 @@ static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port)
1858 struct ftdi_private *priv = usb_get_serial_port_data(port); 1838 struct ftdi_private *priv = usb_get_serial_port_data(port);
1859 int result; 1839 int result;
1860 1840
1861 dbg("%s", __func__);
1862
1863 /* No error checking for this (will get errors later anyway) */ 1841 /* No error checking for this (will get errors later anyway) */
1864 /* See ftdi_sio.h for description of what is reset */ 1842 /* See ftdi_sio.h for description of what is reset */
1865 usb_control_msg(dev, usb_sndctrlpipe(dev, 0), 1843 usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
@@ -1918,8 +1896,6 @@ static void ftdi_close(struct usb_serial_port *port)
1918{ 1896{
1919 struct ftdi_private *priv = usb_get_serial_port_data(port); 1897 struct ftdi_private *priv = usb_get_serial_port_data(port);
1920 1898
1921 dbg("%s", __func__);
1922
1923 usb_serial_generic_close(port); 1899 usb_serial_generic_close(port);
1924 kref_put(&priv->kref, ftdi_sio_priv_release); 1900 kref_put(&priv->kref, ftdi_sio_priv_release);
1925} 1901}
@@ -1976,8 +1952,6 @@ static int ftdi_process_packet(struct tty_struct *tty,
1976 char flag; 1952 char flag;
1977 char *ch; 1953 char *ch;
1978 1954
1979 dbg("%s - port %d", __func__, port->number);
1980
1981 if (len < 2) { 1955 if (len < 2) {
1982 dbg("malformed packet"); 1956 dbg("malformed packet");
1983 return 0; 1957 return 0;
@@ -2121,8 +2095,6 @@ static void ftdi_set_termios(struct tty_struct *tty,
2121 unsigned char vstop; 2095 unsigned char vstop;
2122 unsigned char vstart; 2096 unsigned char vstart;
2123 2097
2124 dbg("%s", __func__);
2125
2126 /* Force baud rate if this device requires it, unless it is set to 2098 /* Force baud rate if this device requires it, unless it is set to
2127 B0. */ 2099 B0. */
2128 if (priv->force_baud && ((termios->c_cflag & CBAUD) != B0)) { 2100 if (priv->force_baud && ((termios->c_cflag & CBAUD) != B0)) {
@@ -2295,8 +2267,6 @@ static int ftdi_tiocmget(struct tty_struct *tty)
2295 int len; 2267 int len;
2296 int ret; 2268 int ret;
2297 2269
2298 dbg("%s TIOCMGET", __func__);
2299
2300 buf = kmalloc(2, GFP_KERNEL); 2270 buf = kmalloc(2, GFP_KERNEL);
2301 if (!buf) 2271 if (!buf)
2302 return -ENOMEM; 2272 return -ENOMEM;
@@ -2346,7 +2316,7 @@ static int ftdi_tiocmset(struct tty_struct *tty,
2346 unsigned int set, unsigned int clear) 2316 unsigned int set, unsigned int clear)
2347{ 2317{
2348 struct usb_serial_port *port = tty->driver_data; 2318 struct usb_serial_port *port = tty->driver_data;
2349 dbg("%s TIOCMSET", __func__); 2319
2350 return update_mctrl(port, set, clear); 2320 return update_mctrl(port, set, clear);
2351} 2321}
2352 2322
@@ -2435,7 +2405,6 @@ static int __init ftdi_init(void)
2435{ 2405{
2436 int retval; 2406 int retval;
2437 2407
2438 dbg("%s", __func__);
2439 if (vendor > 0 && product > 0) { 2408 if (vendor > 0 && product > 0) {
2440 /* Add user specified VID/PID to reserved element of table. */ 2409 /* Add user specified VID/PID to reserved element of table. */
2441 int i; 2410 int i;
@@ -2454,8 +2423,6 @@ static int __init ftdi_init(void)
2454 2423
2455static void __exit ftdi_exit(void) 2424static void __exit ftdi_exit(void)
2456{ 2425{
2457 dbg("%s", __func__);
2458
2459 usb_serial_deregister_drivers(&ftdi_driver, serial_drivers); 2426 usb_serial_deregister_drivers(&ftdi_driver, serial_drivers);
2460} 2427}
2461 2428