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/usb_debug.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'drivers/usb/serial/usb_debug.c') diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c index 9b632e75321..5b29b4a2ebc 100644 --- a/drivers/usb/serial/usb_debug.c +++ b/drivers/usb/serial/usb_debug.c @@ -40,7 +40,6 @@ static struct usb_driver debug_driver = { .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, - .no_dynamic_id = 1, }; /* This HW really does not support a serial break, so one will be @@ -74,30 +73,24 @@ static struct usb_serial_driver debug_device = { .name = "debug", }, .id_table = id_table, - .usb_driver = &debug_driver, .num_ports = 1, .bulk_out_size = USB_DEBUG_MAX_PACKET_SIZE, .break_ctl = usb_debug_break_ctl, .process_read_urb = usb_debug_process_read_urb, }; +static struct usb_serial_driver * const serial_drivers[] = { + &debug_device, NULL +}; + static int __init debug_init(void) { - int retval; - - retval = usb_serial_register(&debug_device); - if (retval) - return retval; - retval = usb_register(&debug_driver); - if (retval) - usb_serial_deregister(&debug_device); - return retval; + return usb_serial_register_drivers(&debug_driver, serial_drivers); } static void __exit debug_exit(void) { - usb_deregister(&debug_driver); - usb_serial_deregister(&debug_device); + usb_serial_deregister_drivers(&debug_driver, serial_drivers); } module_init(debug_init); -- cgit v1.2.3-70-g09d2 From 491c77a96689821bbe6acbef7dd1544bec35f794 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 28 Feb 2012 13:12:41 -0800 Subject: USB: serial: usb_debug.c: use module_usb_serial_driver This converts the usb_debug.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: Johan Hovold CC: Alan Stern Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/usb_debug.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'drivers/usb/serial/usb_debug.c') diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c index 5b29b4a2ebc..e3e8995a473 100644 --- a/drivers/usb/serial/usb_debug.c +++ b/drivers/usb/serial/usb_debug.c @@ -83,16 +83,5 @@ static struct usb_serial_driver * const serial_drivers[] = { &debug_device, NULL }; -static int __init debug_init(void) -{ - return usb_serial_register_drivers(&debug_driver, serial_drivers); -} - -static void __exit debug_exit(void) -{ - usb_serial_deregister_drivers(&debug_driver, serial_drivers); -} - -module_init(debug_init); -module_exit(debug_exit); +module_usb_serial_driver(debug_driver, serial_drivers); MODULE_LICENSE("GPL"); -- cgit v1.2.3-70-g09d2