From 97b6b6d2339f67eb17d954930a908b762af66228 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Thu, 23 Feb 2012 14:56:32 -0500 Subject: usb-serial: use new registration API in [d-h]* drivers This patch (as1524) modifies the following usb-serial drivers to utilize the new usb_serial_{de}register_drivers() routines: digi_acceleport, empeg, ftdi_sio, funsoft, garmin_gps, and hp4x. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/funsoft.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'drivers/usb/serial/funsoft.c') diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c index 5d4b099dcf8b..bb274a244ae9 100644 --- a/drivers/usb/serial/funsoft.c +++ b/drivers/usb/serial/funsoft.c @@ -29,7 +29,6 @@ static struct usb_driver funsoft_driver = { .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, - .no_dynamic_id = 1, }; static struct usb_serial_driver funsoft_device = { @@ -38,27 +37,21 @@ static struct usb_serial_driver funsoft_device = { .name = "funsoft", }, .id_table = id_table, - .usb_driver = &funsoft_driver, .num_ports = 1, }; +static struct usb_serial_driver * const serial_drivers[] = { + &funsoft_device, NULL +}; + static int __init funsoft_init(void) { - int retval; - - retval = usb_serial_register(&funsoft_device); - if (retval) - return retval; - retval = usb_register(&funsoft_driver); - if (retval) - usb_serial_deregister(&funsoft_device); - return retval; + return usb_serial_register_drivers(&funsoft_driver, serial_drivers); } static void __exit funsoft_exit(void) { - usb_deregister(&funsoft_driver); - usb_serial_deregister(&funsoft_device); + usb_serial_deregister_drivers(&funsoft_driver, serial_drivers); } module_init(funsoft_init); -- cgit v1.2.3-59-g8ed1b From 65e3b087d55b224a8c036976535601dd66a7cebd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 28 Feb 2012 13:11:44 -0800 Subject: USB: serial: funsoft.c: use module_usb_serial_driver This converts the funsoft.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: Rusty Russell CC: Alan Stern CC: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/funsoft.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'drivers/usb/serial/funsoft.c') diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c index bb274a244ae9..4577b3607922 100644 --- a/drivers/usb/serial/funsoft.c +++ b/drivers/usb/serial/funsoft.c @@ -44,18 +44,8 @@ static struct usb_serial_driver * const serial_drivers[] = { &funsoft_device, NULL }; -static int __init funsoft_init(void) -{ - return usb_serial_register_drivers(&funsoft_driver, serial_drivers); -} - -static void __exit funsoft_exit(void) -{ - usb_serial_deregister_drivers(&funsoft_driver, serial_drivers); -} - -module_init(funsoft_init); -module_exit(funsoft_exit); +module_usb_serial_driver(funsoft_driver, serial_drivers); + MODULE_LICENSE("GPL"); module_param(debug, bool, S_IRUGO | S_IWUSR); -- cgit v1.2.3-59-g8ed1b