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/hp4x.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'drivers/usb/serial/hp4x.c') diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c index 809379159b0e..325cf092b61c 100644 --- a/drivers/usb/serial/hp4x.c +++ b/drivers/usb/serial/hp4x.c @@ -41,7 +41,6 @@ static struct usb_driver hp49gp_driver = { .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, - .no_dynamic_id = 1, }; static struct usb_serial_driver hp49gp_device = { @@ -50,32 +49,27 @@ static struct usb_serial_driver hp49gp_device = { .name = "hp4X", }, .id_table = id_table, - .usb_driver = &hp49gp_driver, .num_ports = 1, }; +static struct usb_serial_driver * const serial_drivers[] = { + &hp49gp_device, NULL +}; + static int __init hp49gp_init(void) { int retval; - retval = usb_serial_register(&hp49gp_device); - if (retval) - goto failed_usb_serial_register; - retval = usb_register(&hp49gp_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(&hp49gp_device); -failed_usb_serial_register: + + retval = usb_serial_register_drivers(&hp49gp_driver, serial_drivers); + if (retval == 0) + printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" + DRIVER_DESC "\n"); return retval; } static void __exit hp49gp_exit(void) { - usb_deregister(&hp49gp_driver); - usb_serial_deregister(&hp49gp_device); + usb_serial_deregister_drivers(&hp49gp_driver, serial_drivers); } module_init(hp49gp_init); -- cgit v1.2.3-59-g8ed1b From 68e9c9a7fdbddab3407596b3e7f1a4972d045444 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 28 Feb 2012 13:11:49 -0800 Subject: USB: serial: hp4x.c: use module_usb_serial_driver This converts the hp4x.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/hp4x.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'drivers/usb/serial/hp4x.c') diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c index 325cf092b61c..2563e788c9b3 100644 --- a/drivers/usb/serial/hp4x.c +++ b/drivers/usb/serial/hp4x.c @@ -56,24 +56,7 @@ static struct usb_serial_driver * const serial_drivers[] = { &hp49gp_device, NULL }; -static int __init hp49gp_init(void) -{ - int retval; - - retval = usb_serial_register_drivers(&hp49gp_driver, serial_drivers); - if (retval == 0) - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" - DRIVER_DESC "\n"); - return retval; -} - -static void __exit hp49gp_exit(void) -{ - usb_serial_deregister_drivers(&hp49gp_driver, serial_drivers); -} - -module_init(hp49gp_init); -module_exit(hp49gp_exit); +module_usb_serial_driver(hp49gp_driver, serial_drivers); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_VERSION(DRIVER_VERSION); -- cgit v1.2.3-59-g8ed1b