1 files changed, 1 insertions, 28 deletions

diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index e8eb6347bf3a..346c15a51066 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -216,16 +216,8 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(GARMIN_VENDOR_ID, 3) },
         { }                                     /* Terminating entry */
 };
-
 MODULE_DEVICE_TABLE(usb, id_table);
 
-static struct usb_driver garmin_driver = {
-        .name =         "garmin_gps",
-        .probe =        usb_serial_probe,
-        .disconnect =   usb_serial_disconnect,
-        .id_table =     id_table,
-};
-
 
 static inline int getLayerId(const __u8 *usbPacket)
 {
@@ -345,8 +337,6 @@ static void pkt_clear(struct garmin_data *garmin_data_p)
         unsigned long flags;
         struct garmin_packet *result = NULL;
 
-        dbg("%s", __func__);
-
         spin_lock_irqsave(&garmin_data_p->lock, flags);
         while (!list_empty(&garmin_data_p->pktlist)) {
                 result = (struct garmin_packet *)garmin_data_p->pktlist.next;
@@ -939,8 +929,6 @@ static int garmin_open(struct tty_struct *tty, struct usb_serial_port *port)
         int status = 0;
         struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
 
-        dbg("%s - port %d", __func__, port->number);
-
         spin_lock_irqsave(&garmin_data_p->lock, flags);
         garmin_data_p->mode  = initial_mode;
         garmin_data_p->count = 0;
@@ -996,8 +984,6 @@ static void garmin_write_bulk_callback(struct urb *urb)
                 struct garmin_data *garmin_data_p =
                                         usb_get_serial_port_data(port);
 
-                dbg("%s - port %d", __func__, port->number);
-
                 if (GARMIN_LAYERID_APPL == getLayerId(urb->transfer_buffer)) {
 
                         if (garmin_data_p->mode == MODE_GARMIN_SERIAL) {
@@ -1027,9 +1013,6 @@ static int garmin_write_bulk(struct usb_serial_port *port,
         unsigned char *buffer;
         int status;
 
-        dbg("%s - port %d, state %d", __func__, port->number,
-                garmin_data_p->state);
-
         spin_lock_irqsave(&garmin_data_p->lock, flags);
         garmin_data_p->flags &= ~FLAGS_DROP_DATA;
         spin_unlock_irqrestore(&garmin_data_p->lock, flags);
@@ -1224,8 +1207,6 @@ static void garmin_read_bulk_callback(struct urb *urb)
         int status = urb->status;
         int retval;
 
-        dbg("%s - port %d", __func__, port->number);
-
         if (!serial) {
                 dbg("%s - bad serial pointer, exiting", __func__);
                 return;
@@ -1384,7 +1365,6 @@ static void garmin_throttle(struct tty_struct *tty)
         struct usb_serial_port *port = tty->driver_data;
         struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
 
-        dbg("%s - port %d", __func__, port->number);
         /* set flag, data received will be put into a queue
            for later processing */
         spin_lock_irq(&garmin_data_p->lock);
@@ -1399,7 +1379,6 @@ static void garmin_unthrottle(struct tty_struct *tty)
         struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
         int status;
 
-        dbg("%s - port %d", __func__, port->number);
         spin_lock_irq(&garmin_data_p->lock);
         garmin_data_p->flags &= ~FLAGS_THROTTLED;
         spin_unlock_irq(&garmin_data_p->lock);
@@ -1441,8 +1420,6 @@ static int garmin_attach(struct usb_serial *serial)
         struct usb_serial_port *port = serial->port[0];
         struct garmin_data *garmin_data_p = NULL;
 
-        dbg("%s", __func__);
-
         garmin_data_p = kzalloc(sizeof(struct garmin_data), GFP_KERNEL);
         if (garmin_data_p == NULL) {
                 dev_err(&port->dev, "%s - Out of memory\n", __func__);
@@ -1471,8 +1448,6 @@ static void garmin_disconnect(struct usb_serial *serial)
         struct usb_serial_port *port = serial->port[0];
         struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
 
-        dbg("%s", __func__);
-
         usb_kill_urb(port->interrupt_in_urb);
         del_timer_sync(&garmin_data_p->timer);
 }
@@ -1483,8 +1458,6 @@ static void garmin_release(struct usb_serial *serial)
         struct usb_serial_port *port = serial->port[0];
         struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
 
-        dbg("%s", __func__);
-
         kfree(garmin_data_p);
 }
 
@@ -1516,7 +1489,7 @@ static struct usb_serial_driver * const serial_drivers[] = {
         &garmin_device, NULL
 };
 
-module_usb_serial_driver(garmin_driver, serial_drivers);
+module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);