1 files changed, 4 insertions, 22 deletions

diff --git a/drivers/usb/serial/qcaux.c b/drivers/usb/serial/qcaux.c
index a34819884c1a..966245680f55 100644
--- a/drivers/usb/serial/qcaux.c
+++ b/drivers/usb/serial/qcaux.c
@@ -82,7 +82,6 @@ static struct usb_driver qcaux_driver = {
         .probe =        usb_serial_probe,
         .disconnect =   usb_serial_disconnect,
         .id_table =     id_table,
-        .no_dynamic_id =        1,
 };
 
 static struct usb_serial_driver qcaux_device = {
@@ -91,29 +90,12 @@ static struct usb_serial_driver qcaux_device = {
                 .name =         "qcaux",
         },
         .id_table =             id_table,
-        .usb_driver =           &qcaux_driver,
         .num_ports =            1,
 };
 
-static int __init qcaux_init(void)
-{
-        int retval;
-
-        retval = usb_serial_register(&qcaux_device);
-        if (retval)
-                return retval;
-        retval = usb_register(&qcaux_driver);
-        if (retval)
-                usb_serial_deregister(&qcaux_device);
-        return retval;
-}
-
-static void __exit qcaux_exit(void)
-{
-        usb_deregister(&qcaux_driver);
-        usb_serial_deregister(&qcaux_device);
-}
+static struct usb_serial_driver * const serial_drivers[] = {
+        &qcaux_device, NULL
+};
 
-module_init(qcaux_init);
-module_exit(qcaux_exit);
+module_usb_serial_driver(qcaux_driver, serial_drivers);
 MODULE_LICENSE("GPL");