diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2012-02-23 14:56:57 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-24 12:39:18 -0800 |
| commit | 7dbe2460989b10644651e779b17b683627feea48 (patch) | |
| tree | 51ab97a04dfdcea7e71cbc5e8953efab69714b90 /drivers/usb/serial/iuu_phoenix.c | |
| parent | 97b6b6d2339f67eb17d954930a908b762af66228 (diff) | |
usb-serial: use new registration API in [i-j]* drivers
This patch (as1525) modifies the following usb-serial drivers to
utilize the new usb_serial_{de}register_drivers() routines:
io_edgeport, io_ti, ipaq, ipw, ir-usb, and iuu_phoenix.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/iuu_phoenix.c')
| -rw-r--r-- | drivers/usb/serial/iuu_phoenix.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c index 3077a4436976..97a7ea2a5e4f 100644 --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c @@ -56,7 +56,6 @@ static struct usb_driver iuu_driver = { .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, - .no_dynamic_id = 1, }; /* turbo parameter */ @@ -1274,7 +1273,6 @@ static struct usb_serial_driver iuu_device = { .name = "iuu_phoenix", }, .id_table = id_table, - .usb_driver = &iuu_driver, .num_ports = 1, .bulk_in_size = 512, .bulk_out_size = 512, @@ -1292,28 +1290,24 @@ static struct usb_serial_driver iuu_device = { .release = iuu_release, }; +static struct usb_serial_driver * const serial_drivers[] = { + &iuu_device, NULL +}; + static int __init iuu_init(void) { int retval; - retval = usb_serial_register(&iuu_device); - if (retval) - goto failed_usb_serial_register; - retval = usb_register(&iuu_driver); - if (retval) - goto failed_usb_register; - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" - DRIVER_DESC "\n"); - return 0; -failed_usb_register: - usb_serial_deregister(&iuu_device); -failed_usb_serial_register: + + retval = usb_serial_register_drivers(&iuu_driver, serial_drivers); + if (retval == 0) + printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" + DRIVER_DESC "\n"); return retval; } static void __exit iuu_exit(void) { - usb_deregister(&iuu_driver); - usb_serial_deregister(&iuu_device); + usb_serial_deregister_drivers(&iuu_driver, serial_drivers); } module_init(iuu_init); |