usb-serial: use new registration API in [a-c]* drivers

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

	aircable, ark3116, belkin_sa, ch341, cp210x, cyberjack,
	and cypress_m8.

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

1 files changed, 11 insertions, 18 deletions

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 6bc3802a581a..d2e536f649ba 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -82,7 +82,6 @@ static struct usb_driver cyberjack_driver = {
         .probe =        usb_serial_probe,
         .disconnect =   usb_serial_disconnect,
         .id_table =     id_table,
-        .no_dynamic_id =        1,
 };
 
 static struct usb_serial_driver cyberjack_device = {
@@ -91,7 +90,6 @@ static struct usb_serial_driver cyberjack_device = {
                 .name =         "cyberjack",
         },
         .description =          "Reiner SCT Cyberjack USB card reader",
-        .usb_driver =           &cyberjack_driver,
         .id_table =             id_table,
         .num_ports =            1,
         .attach =               cyberjack_startup,
@@ -106,6 +104,10 @@ static struct usb_serial_driver cyberjack_device = {
         .write_bulk_callback =  cyberjack_write_bulk_callback,
 };
 
+static struct usb_serial_driver * const serial_drivers[] = {
+        &cyberjack_device, NULL
+};
+
 struct cyberjack_private {
         spinlock_t      lock;           /* Lock for SMP */
         short           rdtodo;         /* Bytes still to read */
@@ -476,28 +478,19 @@ exit:
 static int __init cyberjack_init(void)
 {
         int retval;
-        retval  = usb_serial_register(&cyberjack_device);
-        if (retval)
-                goto failed_usb_serial_register;
-        retval = usb_register(&cyberjack_driver);
-        if (retval)
-                goto failed_usb_register;
-
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION " "
-               DRIVER_AUTHOR "\n");
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
 
-        return 0;
-failed_usb_register:
-        usb_serial_deregister(&cyberjack_device);
-failed_usb_serial_register:
+        retval = usb_serial_register_drivers(&cyberjack_driver, serial_drivers);
+        if (retval == 0) {
+                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION " "
+                               DRIVER_AUTHOR "\n");
+                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
+        }
         return retval;
 }
 
 static void __exit cyberjack_exit(void)
 {
-        usb_deregister(&cyberjack_driver);
-        usb_serial_deregister(&cyberjack_device);
+        usb_serial_deregister_drivers(&cyberjack_driver, serial_drivers);
 }
 
 module_init(cyberjack_init);