From 29618e9fb5507b9fcf07f739a8506a3640495945 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Thu, 23 Feb 2012 14:57:32 -0500 Subject: 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 Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/zio.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'drivers/usb/serial/zio.c') 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); -- cgit From dba607f9f0aebfa8f29b3eb911250aa19d5d71a8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 28 Feb 2012 13:12:46 -0800 Subject: USB: serial: zio.c: use module_usb_serial_driver This converts the zio.c driver to use the module_usb_serial_driver() call instead of having to have a module_init/module_exit function, saving a lot of duplicated code. CC: Alan Stern Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/zio.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'drivers/usb/serial/zio.c') diff --git a/drivers/usb/serial/zio.c b/drivers/usb/serial/zio.c index ae8115aab77d..9d0bb3752cd4 100644 --- a/drivers/usb/serial/zio.c +++ b/drivers/usb/serial/zio.c @@ -42,16 +42,5 @@ static struct usb_serial_driver * const serial_drivers[] = { &zio_device, NULL }; -static int __init zio_init(void) -{ - return usb_serial_register_drivers(&zio_driver, serial_drivers); -} - -static void __exit zio_exit(void) -{ - usb_serial_deregister_drivers(&zio_driver, serial_drivers); -} - -module_init(zio_init); -module_exit(zio_exit); +module_usb_serial_driver(zio_driver, serial_drivers); MODULE_LICENSE("GPL"); -- cgit