1 files changed, 5 insertions, 47 deletions

diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 10c02b8b5664..c85a7eb87d4e 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -33,7 +33,6 @@
 #define DRIVER_AUTHOR "Ganesh Varadarajan <ganesh@veritas.com>"
 #define DRIVER_DESC "USB PocketPC PDA driver"
 
-static __u16 product, vendor;
 static bool debug;
 static int connect_retries = KP_RETRIES;
 static int initial_wait;
@@ -45,8 +44,6 @@ static int  ipaq_calc_num_ports(struct usb_serial *serial);
 static int  ipaq_startup(struct usb_serial *serial);
 
 static struct usb_device_id ipaq_id_table [] = {
-        /* The first entry is a placeholder for the insmod-specified device */
-        { USB_DEVICE(0x049F, 0x0003) },
         { USB_DEVICE(0x0104, 0x00BE) }, /* Socket USB Sync */
         { USB_DEVICE(0x03F0, 0x1016) }, /* HP USB Sync */
         { USB_DEVICE(0x03F0, 0x1116) }, /* HP USB Sync 1611 */
@@ -505,13 +502,6 @@ static struct usb_device_id ipaq_id_table [] = {
 
 MODULE_DEVICE_TABLE(usb, ipaq_id_table);
 
-static struct usb_driver ipaq_driver = {
-        .name =         "ipaq",
-        .probe =        usb_serial_probe,
-        .disconnect =   usb_serial_disconnect,
-        .id_table =     ipaq_id_table,
-};
-
 
 /* All of the device info needed for the Compaq iPAQ */
 static struct usb_serial_driver ipaq_device = {
@@ -539,8 +529,6 @@ static int ipaq_open(struct tty_struct *tty,
         int                     result = 0;
         int                     retries = connect_retries;
 
-        dbg("%s - port %d", __func__, port->number);
-
         msleep(1000*initial_wait);
 
         /*
@@ -577,7 +565,7 @@ static int ipaq_calc_num_ports(struct usb_serial *serial)
          */
         int ipaq_num_ports = 1;
 
-        dbg("%s - numberofendpoints: %d", __FUNCTION__,
+        dev_dbg(&serial->dev->dev, "%s - numberofendpoints: %d\n", __func__,
                 (int)serial->interface->cur_altsetting->desc.bNumEndpoints);
 
         /*
@@ -596,8 +584,6 @@ static int ipaq_calc_num_ports(struct usb_serial *serial)
 
 static int ipaq_startup(struct usb_serial *serial)
 {
-        dbg("%s", __func__);
-
         /* Some of the devices in ipaq_id_table[] are composite, and we
          * shouldn't bind to all the interfaces.  This test will rule out
          * some obviously invalid possibilities.
@@ -617,36 +603,14 @@ static int ipaq_startup(struct usb_serial *serial)
                 return -ENODEV;
         }
 
-        dbg("%s - iPAQ module configured for %d ports",
-                __FUNCTION__, serial->num_ports);
+        dev_dbg(&serial->dev->dev,
+                "%s - iPAQ module configured for %d ports\n", __func__,
+                serial->num_ports);
 
         return usb_reset_configuration(serial->dev);
 }
 
-static int __init ipaq_init(void)
-{
-        int retval;
-
-        if (vendor) {
-                ipaq_id_table[0].idVendor = vendor;
-                ipaq_id_table[0].idProduct = product;
-        }
-
-        retval = usb_serial_register_drivers(&ipaq_driver, serial_drivers);
-        if (retval == 0)
-                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-                               DRIVER_DESC "\n");
-        return retval;
-}
-
-static void __exit ipaq_exit(void)
-{
-        usb_serial_deregister_drivers(&ipaq_driver, serial_drivers);
-}
-
-
-module_init(ipaq_init);
-module_exit(ipaq_exit);
+module_usb_serial_driver(serial_drivers, ipaq_id_table);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
@@ -655,12 +619,6 @@ MODULE_LICENSE("GPL");
 module_param(debug, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Debug enabled or not");
 
-module_param(vendor, ushort, 0);
-MODULE_PARM_DESC(vendor, "User specified USB idVendor");
-
-module_param(product, ushort, 0);
-MODULE_PARM_DESC(product, "User specified USB idProduct");
-
 module_param(connect_retries, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(connect_retries,
                 "Maximum number of connect retries (one second each)");