1 files changed, 5 insertions, 25 deletions

diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index 1a5be136e6c..e53d2aac35c 100644
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -54,8 +54,6 @@ static void symbol_int_callback(struct urb *urb)
         int result;
         int data_length;
 
-        dbg("%s - port %d", __func__, port->number);
-
         switch (status) {
         case 0:
                 /* success */
@@ -64,12 +62,12 @@ static void symbol_int_callback(struct urb *urb)
         case -ENOENT:
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
-                dbg("%s - urb shutting down with status: %d",
-                    __func__, status);
+                dev_dbg(&port->dev, "%s - urb shutting down with status: %d\n",
+                        __func__, status);
                 return;
         default:
-                dbg("%s - nonzero urb status received: %d",
-                    __func__, status);
+                dev_dbg(&port->dev, "%s - nonzero urb status received: %d\n",
+                        __func__, status);
                 goto exit;
         }
 
@@ -125,8 +123,6 @@ static int symbol_open(struct tty_struct *tty, struct usb_serial_port *port)
         unsigned long flags;
         int result = 0;
 
-        dbg("%s - port %d", __func__, port->number);
-
         spin_lock_irqsave(&priv->lock, flags);
         priv->throttled = false;
         priv->actually_throttled = false;
@@ -150,8 +146,6 @@ static void symbol_close(struct usb_serial_port *port)
 {
         struct symbol_private *priv = usb_get_serial_data(port->serial);
 
-        dbg("%s - port %d", __func__, port->number);
-
         /* shutdown our urbs */
         usb_kill_urb(priv->int_urb);
 }
@@ -161,7 +155,6 @@ static void symbol_throttle(struct tty_struct *tty)
         struct usb_serial_port *port = tty->driver_data;
         struct symbol_private *priv = usb_get_serial_data(port->serial);
 
-        dbg("%s - port %d", __func__, port->number);
         spin_lock_irq(&priv->lock);
         priv->throttled = true;
         spin_unlock_irq(&priv->lock);
@@ -174,8 +167,6 @@ static void symbol_unthrottle(struct tty_struct *tty)
         int result;
         bool was_throttled;
 
-        dbg("%s - port %d", __func__, port->number);
-
         spin_lock_irq(&priv->lock);
         priv->throttled = false;
         was_throttled = priv->actually_throttled;
@@ -266,8 +257,6 @@ static void symbol_disconnect(struct usb_serial *serial)
 {
         struct symbol_private *priv = usb_get_serial_data(serial);
 
-        dbg("%s", __func__);
-
         usb_kill_urb(priv->int_urb);
         usb_free_urb(priv->int_urb);
 }
@@ -276,19 +265,10 @@ static void symbol_release(struct usb_serial *serial)
 {
         struct symbol_private *priv = usb_get_serial_data(serial);
 
-        dbg("%s", __func__);
-
         kfree(priv->int_buffer);
         kfree(priv);
 }
 
-static struct usb_driver symbol_driver = {
-        .name =                 "symbol",
-        .probe =                usb_serial_probe,
-        .disconnect =           usb_serial_disconnect,
-        .id_table =             id_table,
-};
-
 static struct usb_serial_driver symbol_device = {
         .driver = {
                 .owner =        THIS_MODULE,
@@ -309,7 +289,7 @@ static struct usb_serial_driver * const serial_drivers[] = {
         &symbol_device, NULL
 };
 
-module_usb_serial_driver(symbol_driver, serial_drivers);
+module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_LICENSE("GPL");