usb-serial: use new registration API in [d-h]* drivers

This patch (as1524) modifies the following usb-serial drivers to
utilize the new usb_serial_{de}register_drivers() routines:

	digi_acceleport, empeg, ftdi_sio, funsoft, garmin_gps,
	and hp4x.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 8 insertions, 17 deletions

diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 21343378c322..69da3abcb363 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -224,7 +224,6 @@ static struct usb_driver garmin_driver = {
         .probe =        usb_serial_probe,
         .disconnect =   usb_serial_disconnect,
         .id_table =     id_table,
-        .no_dynamic_id = 1,
 };
 
 
@@ -1497,7 +1496,6 @@ static struct usb_serial_driver garmin_device = {
                 .name        = "garmin_gps",
         },
         .description         = "Garmin GPS usb/tty",
-        .usb_driver          = &garmin_driver,
         .id_table            = id_table,
         .num_ports           = 1,
         .open                = garmin_open,
@@ -1514,33 +1512,26 @@ static struct usb_serial_driver garmin_device = {
         .read_int_callback   = garmin_read_int_callback,
 };
 
+static struct usb_serial_driver * const serial_drivers[] = {
+        &garmin_device, NULL
+};
 
 
 static int __init garmin_init(void)
 {
         int retval;
 
-        retval = usb_serial_register(&garmin_device);
-        if (retval)
-                goto failed_garmin_register;
-        retval = usb_register(&garmin_driver);
-        if (retval)
-                goto failed_usb_register;
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-               DRIVER_DESC "\n");
-
-        return 0;
-failed_usb_register:
-        usb_serial_deregister(&garmin_device);
-failed_garmin_register:
+        retval = usb_serial_register_drivers(&garmin_driver, serial_drivers);
+        if (retval == 0)
+                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                               DRIVER_DESC "\n");
         return retval;
 }
 
 
 static void __exit garmin_exit(void)
 {
-        usb_deregister(&garmin_driver);
-        usb_serial_deregister(&garmin_device);
+        usb_serial_deregister_drivers(&garmin_driver, serial_drivers);
 }