1 files changed, 10 insertions, 16 deletions

diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index 29ffeb6279c7..e8b473f5acf7 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -78,7 +78,6 @@ static struct usb_driver belkin_driver = {
         .probe =        usb_serial_probe,
         .disconnect =   usb_serial_disconnect,
         .id_table =     id_table_combined,
-        .no_dynamic_id =        1,
 };
 
 /* All of the device info needed for the serial converters */
@@ -88,7 +87,6 @@ static struct usb_serial_driver belkin_device = {
                 .name =         "belkin",
         },
         .description =          "Belkin / Peracom / GoHubs USB Serial Adapter",
-        .usb_driver =           &belkin_driver,
         .id_table =             id_table_combined,
         .num_ports =            1,
         .open =                 belkin_sa_open,
@@ -103,6 +101,10 @@ static struct usb_serial_driver belkin_device = {
         .release =              belkin_sa_release,
 };
 
+static struct usb_serial_driver * const serial_drivers[] = {
+        &belkin_device, NULL
+};
+
 struct belkin_sa_private {
         spinlock_t              lock;
         unsigned long           control_state;
@@ -526,25 +528,17 @@ exit:
 static int __init belkin_sa_init(void)
 {
         int retval;
-        retval = usb_serial_register(&belkin_device);
-        if (retval)
-                goto failed_usb_serial_register;
-        retval = usb_register(&belkin_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(&belkin_device);
-failed_usb_serial_register:
+
+        retval = usb_serial_register_drivers(&belkin_driver, serial_drivers);
+        if (retval == 0)
+                printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                               DRIVER_DESC "\n");
         return retval;
 }
 
 static void __exit belkin_sa_exit (void)
 {
-        usb_deregister(&belkin_driver);
-        usb_serial_deregister(&belkin_device);
+        usb_serial_deregister_drivers(&belkin_driver, serial_drivers);
 }