diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2012-02-23 23:57:32 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-25 00:39:21 +0400 |
| commit | 29618e9fb5507b9fcf07f739a8506a3640495945 (patch) | |
| tree | d5b05698811d39a6068bd8bfae99e04cb6da4e8f /drivers/usb/serial/zio.c | |
| parent | d860322f34e4a53f347b1aeae23d5b72f1e91b8c (diff) | |
| download | linux-29618e9fb5507b9fcf07f739a8506a3640495945.tar.xz | |
usb-serial: use new registration API in [t-z]* drivers
This patch (as1529) modifies the following usb-serial drivers to
utilize the new usb_serial_{de}register_drivers() routines:
ti_usb_3410_5052, usb_debug, visor, vivopay-serial,
whiteheat, and zio.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/zio.c')
| -rw-r--r-- | drivers/usb/serial/zio.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/usb/serial/zio.c b/drivers/usb/serial/zio.c index f57967278833..ae8115aab77d 100644 --- a/drivers/usb/serial/zio.c +++ b/drivers/usb/serial/zio.c @@ -27,7 +27,6 @@ static struct usb_driver zio_driver = { .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, - .no_dynamic_id = 1, }; static struct usb_serial_driver zio_device = { @@ -36,27 +35,21 @@ static struct usb_serial_driver zio_device = { .name = "zio", }, .id_table = id_table, - .usb_driver = &zio_driver, .num_ports = 1, }; +static struct usb_serial_driver * const serial_drivers[] = { + &zio_device, NULL +}; + static int __init zio_init(void) { - int retval; - - retval = usb_serial_register(&zio_device); - if (retval) - return retval; - retval = usb_register(&zio_driver); - if (retval) - usb_serial_deregister(&zio_device); - return retval; + return usb_serial_register_drivers(&zio_driver, serial_drivers); } static void __exit zio_exit(void) { - usb_deregister(&zio_driver); - usb_serial_deregister(&zio_device); + usb_serial_deregister_drivers(&zio_driver, serial_drivers); } module_init(zio_init); |