diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2012-02-23 14:56:17 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-24 12:39:17 -0800 |
commit | 08a4f6bc2e7046ce50849d7589b7d0763926d808 (patch) | |
tree | 9c2f247154db1872ef71e9c5ec8afbdd87e02b83 /drivers/usb/serial/aircable.c | |
parent | 765e0ba62613fb90f09c1b5926750df0aa56f349 (diff) |
usb-serial: use new registration API in [a-c]* drivers
This patch (as1523) modifies the following usb-serial drivers to
utilize the new usb_serial_{de}register_drivers() routines:
aircable, ark3116, belkin_sa, ch341, cp210x, cyberjack,
and cypress_m8.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/aircable.c')
-rw-r--r-- | drivers/usb/serial/aircable.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c index 123bf9155339..dbf3bddc1b51 100644 --- a/drivers/usb/serial/aircable.c +++ b/drivers/usb/serial/aircable.c @@ -175,7 +175,6 @@ static struct usb_driver aircable_driver = { .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, - .no_dynamic_id = 1, }; static struct usb_serial_driver aircable_device = { @@ -183,7 +182,6 @@ static struct usb_serial_driver aircable_device = { .owner = THIS_MODULE, .name = "aircable", }, - .usb_driver = &aircable_driver, .id_table = id_table, .num_ports = 1, .bulk_out_size = HCI_COMPLETE_FRAME, @@ -194,27 +192,18 @@ static struct usb_serial_driver aircable_device = { .unthrottle = usb_serial_generic_unthrottle, }; +static struct usb_serial_driver * const serial_drivers[] = { + &aircable_device, NULL +}; + static int __init aircable_init(void) { - int retval; - retval = usb_serial_register(&aircable_device); - if (retval) - goto failed_serial_register; - retval = usb_register(&aircable_driver); - if (retval) - goto failed_usb_register; - return 0; - -failed_usb_register: - usb_serial_deregister(&aircable_device); -failed_serial_register: - return retval; + return usb_serial_register_drivers(&aircable_driver, serial_drivers); } static void __exit aircable_exit(void) { - usb_deregister(&aircable_driver); - usb_serial_deregister(&aircable_device); + usb_serial_deregister_drivers(&aircable_driver, serial_drivers); } MODULE_AUTHOR(DRIVER_AUTHOR); |