1 files changed, 6 insertions, 13 deletions

diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c
index 5d4b099dcf8b..bb274a244ae9 100644
--- a/drivers/usb/serial/funsoft.c
+++ b/drivers/usb/serial/funsoft.c
@@ -29,7 +29,6 @@ static struct usb_driver funsoft_driver = {
         .probe =        usb_serial_probe,
         .disconnect =   usb_serial_disconnect,
         .id_table =     id_table,
-        .no_dynamic_id =        1,
 };
 
 static struct usb_serial_driver funsoft_device = {
@@ -38,27 +37,21 @@ static struct usb_serial_driver funsoft_device = {
                 .name =         "funsoft",
         },
         .id_table =             id_table,
-        .usb_driver =           &funsoft_driver,
         .num_ports =            1,
 };
 
+static struct usb_serial_driver * const serial_drivers[] = {
+        &funsoft_device, NULL
+};
+
 static int __init funsoft_init(void)
 {
-        int retval;
-
-        retval = usb_serial_register(&funsoft_device);
-        if (retval)
-                return retval;
-        retval = usb_register(&funsoft_driver);
-        if (retval)
-                usb_serial_deregister(&funsoft_device);
-        return retval;
+        return usb_serial_register_drivers(&funsoft_driver, serial_drivers);
 }
 
 static void __exit funsoft_exit(void)
 {
-        usb_deregister(&funsoft_driver);
-        usb_serial_deregister(&funsoft_device);
+        usb_serial_deregister_drivers(&funsoft_driver, serial_drivers);
 }
 
 module_init(funsoft_init);