1 files changed, 6 insertions, 17 deletions

diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index 123bf9155339..dbf3bddc1b51 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -175,7 +175,6 @@ static struct usb_driver aircable_driver = {
         .probe =        usb_serial_probe,
         .disconnect =   usb_serial_disconnect,
         .id_table =     id_table,
-        .no_dynamic_id =        1,
 };
 
 static struct usb_serial_driver aircable_device = {
@@ -183,7 +182,6 @@ static struct usb_serial_driver aircable_device = {
                 .owner =        THIS_MODULE,
                 .name =         "aircable",
         },
-        .usb_driver =           &aircable_driver,
         .id_table =             id_table,
         .num_ports =            1,
         .bulk_out_size =        HCI_COMPLETE_FRAME,
@@ -194,27 +192,18 @@ static struct usb_serial_driver aircable_device = {
         .unthrottle =           usb_serial_generic_unthrottle,
 };
 
+static struct usb_serial_driver * const serial_drivers[] = {
+        &aircable_device, NULL
+};
+
 static int __init aircable_init(void)
 {
-        int retval;
-        retval = usb_serial_register(&aircable_device);
-        if (retval)
-                goto failed_serial_register;
-        retval = usb_register(&aircable_driver);
-        if (retval)
-                goto failed_usb_register;
-        return 0;
-
-failed_usb_register:
-        usb_serial_deregister(&aircable_device);
-failed_serial_register:
-        return retval;
+        return usb_serial_register_drivers(&aircable_driver, serial_drivers);
 }
 
 static void __exit aircable_exit(void)
 {
-        usb_deregister(&aircable_driver);
-        usb_serial_deregister(&aircable_device);
+        usb_serial_deregister_drivers(&aircable_driver, serial_drivers);
 }
 
 MODULE_AUTHOR(DRIVER_AUTHOR);