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

This patch (as1528) modifies the following usb-serial drivers to
utilize the new usb_serial_{de}register_drivers() routines:

	qcaux, qcserial, safe_serial, siemens_mpi, sierra,
	spcp8x5, ssu100, and symbolserial.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 13 deletions

diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index 50651cf4fc61..76cd9f2a08c0 100644
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -287,7 +287,6 @@ static struct usb_driver symbol_driver = {
         .probe =                usb_serial_probe,
         .disconnect =           usb_serial_disconnect,
         .id_table =             id_table,
-        .no_dynamic_id =        1,
 };
 
 static struct usb_serial_driver symbol_device = {
@@ -296,7 +295,6 @@ static struct usb_serial_driver symbol_device = {
                 .name =         "symbol",
         },
         .id_table =             id_table,
-        .usb_driver =           &symbol_driver,
         .num_ports =            1,
         .attach =               symbol_startup,
         .open =                 symbol_open,
@@ -307,23 +305,18 @@ static struct usb_serial_driver symbol_device = {
         .unthrottle =           symbol_unthrottle,
 };
 
+static struct usb_serial_driver * const serial_drivers[] = {
+        &symbol_device, NULL
+};
+
 static int __init symbol_init(void)
 {
-        int retval;
-
-        retval = usb_serial_register(&symbol_device);
-        if (retval)
-                return retval;
-        retval = usb_register(&symbol_driver);
-        if (retval)
-                usb_serial_deregister(&symbol_device);
-        return retval;
+        return usb_serial_register_drivers(&symbol_driver, serial_drivers);
 }
 
 static void __exit symbol_exit(void)
 {
-        usb_deregister(&symbol_driver);
-        usb_serial_deregister(&symbol_device);
+        usb_serial_deregister_drivers(&symbol_driver, serial_drivers);
 }
 
 module_init(symbol_init);