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, 10 insertions, 16 deletions

diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index aced6817bf95..51bcbd5d5e8e 100644
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -56,7 +56,6 @@ static struct usb_driver empeg_driver = {
         .probe =        usb_serial_probe,
         .disconnect =   usb_serial_disconnect,
         .id_table =     id_table,
-        .no_dynamic_id =        1,
 };
 
 static struct usb_serial_driver empeg_device = {
@@ -65,7 +64,6 @@ static struct usb_serial_driver empeg_device = {
                 .name =         "empeg",
         },
         .id_table =             id_table,
-        .usb_driver =           &empeg_driver,
         .num_ports =            1,
         .bulk_out_size =        256,
         .throttle =             usb_serial_generic_throttle,
@@ -74,6 +72,10 @@ static struct usb_serial_driver empeg_device = {
         .init_termios =         empeg_init_termios,
 };
 
+static struct usb_serial_driver * const serial_drivers[] = {
+        &empeg_device, NULL
+};
+
 static int empeg_startup(struct usb_serial *serial)
 {
         int r;
@@ -140,24 +142,16 @@ static int __init empeg_init(void)
 {
         int retval;
 
-        retval = usb_serial_register(&empeg_device);
-        if (retval)
-                return retval;
-        retval = usb_register(&empeg_driver);
-        if (retval) {
-                usb_serial_deregister(&empeg_device);
-                return retval;
-        }
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-               DRIVER_DESC "\n");
-
-        return 0;
+        retval = usb_serial_register_drivers(&empeg_driver, serial_drivers);
+        if (retval == 0)
+                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                               DRIVER_DESC "\n");
+        return retval;
 }
 
 static void __exit empeg_exit(void)
 {
-        usb_deregister(&empeg_driver);
-        usb_serial_deregister(&empeg_device);
+        usb_serial_deregister_drivers(&empeg_driver, serial_drivers);
 }