usb-serial: use new registration API in [q-s]* drivers

[firefly-linux-kernel-4.4.55.git] / drivers / usb / serial / sierra.c

diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index fdae0a4407cb7b9ddbc0068e4ef2690ba4bbfcf8..d75a75b83e9f09484e23a495cc683816f99c8a01 100644 (file)
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -1084,7 +1084,6 @@ static struct usb_driver sierra_driver = {
        .resume     = usb_serial_resume,
        .reset_resume = sierra_reset_resume,
        .id_table   = id_table,
-       .no_dynamic_id =        1,
        .supports_autosuspend = 1,
 };
 
@@ -1095,7 +1094,6 @@ static struct usb_serial_driver sierra_device = {
        },
        .description       = "Sierra USB modem",
        .id_table          = id_table,
-       .usb_driver        = &sierra_driver,
        .calc_num_ports    = sierra_calc_num_ports,
        .probe             = sierra_probe,
        .open              = sierra_open,
@@ -1113,34 +1111,25 @@ static struct usb_serial_driver sierra_device = {
        .read_int_callback = sierra_instat_callback,
 };
 
+static struct usb_serial_driver * const serial_drivers[] = {
+       &sierra_device, NULL
+};
+
 /* Functions used by new usb-serial code. */
 static int __init sierra_init(void)
 {
        int retval;
-       retval = usb_serial_register(&sierra_device);
-       if (retval)
-               goto failed_device_register;
-
-
-       retval = usb_register(&sierra_driver);
-       if (retval)
-               goto failed_driver_register;
-
-       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-              DRIVER_DESC "\n");
-
-       return 0;
 
-failed_driver_register:
-       usb_serial_deregister(&sierra_device);
-failed_device_register:
+       retval = usb_serial_register_drivers(&sierra_driver, serial_drivers);
+       if (retval == 0)
+               printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+                              DRIVER_DESC "\n");
        return retval;
 }
 
 static void __exit sierra_exit(void)
 {
-       usb_deregister(&sierra_driver);
-       usb_serial_deregister(&sierra_device);
+       usb_serial_deregister_drivers(&sierra_driver, serial_drivers);
 }
 
 module_init(sierra_init);