aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ti_usb_3410_5052.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-08 18:46:14 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-08 18:46:14 -0400
commit68e24113457e437b1576670f2419b77ed0531e9e (patch)
tree4737e411b3df714ff1a2c911dbc66d0ba5e5cf5b /drivers/usb/serial/ti_usb_3410_5052.c
parentd56ba3205fe2e61264ef41f29cd90a666df032e4 (diff)
USB: serial: rework usb_serial_register/deregister_drivers()
This reworks the usb_serial_register_drivers() and usb_serial_deregister_drivers() to not need a pointer to a struct usb_driver anymore. The usb_driver structure is now created dynamically and registered and unregistered as needed. This saves lines of code in each usb-serial driver. All in-kernel users of these functions were also fixed up at this time. The pl2303 driver was tested that everything worked properly. Thanks for the idea to do this from Alan Stern. Cc: Adhir Ramjiawan <adhirramjiawan0@gmail.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Al Borchers <alborchers@steinerpoint.com> Cc: Aleksey Babahin <tamerlan311@gmail.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Andrew Worsley <amworsley@gmail.com> Cc: Bart Hartgers <bart.hartgers@gmail.com> Cc: Bill Pemberton <wfp5p@virginia.edu> Cc: Dan Carpenter <error27@gmail.com> Cc: Dan Williams <dcbw@redhat.com> Cc: Donald Lee <donald@asix.com.tw> Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Felipe Balbi <balbi@ti.com> Cc: Gary Brubaker <xavyer@ix.netcom.com> Cc: Jesper Juhl <jj@chaosbits.net> Cc: Jiri Kosina <jkosina@suse.cz> Cc: Johan Hovold <jhovold@gmail.com> Cc: Julia Lawall <julia@diku.dk> Cc: Kautuk Consul <consul.kautuk@gmail.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Cc: Lonnie Mendez <dignome@gmail.com> Cc: Matthias Bruestle and Harald Welte <support@reiner-sct.com> Cc: Matthias Urlichs <smurf@smurf.noris.de> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: Michal Sroczynski <msroczyn@gmail.com> Cc: "Michał Wróbel" <michal.wrobel@flytronic.pl> Cc: Oliver Neukum <oliver@neukum.name> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Peter Berger <pberger@brimson.com> Cc: Preston Fick <preston.fick@silabs.com> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: Rigbert Hamisch <rigbert@gmx.de> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Simon Arlott <simon@fire.lp0.eu> Cc: Support Department <support@connecttech.com> Cc: Thomas Tuttle <ttuttle@chromium.org> Cc: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> Cc: Wang YanQing <Udknight@gmail.com> Cc: William Greathouse <wgreathouse@smva.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/ti_usb_3410_5052.c')
-rw-r--r--drivers/usb/serial/ti_usb_3410_5052.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 9d96224494b8..a180b15d195a 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -211,11 +211,6 @@ static struct usb_device_id ti_id_table_combined[18+2*TI_EXTRA_VID_PID_COUNT+1]
211 { } 211 { }
212}; 212};
213 213
214static struct usb_driver ti_usb_driver = {
215 .name = "ti_usb_3410_5052",
216 .id_table = ti_id_table_combined,
217};
218
219static struct usb_serial_driver ti_1port_device = { 214static struct usb_serial_driver ti_1port_device = {
220 .driver = { 215 .driver = {
221 .owner = THIS_MODULE, 216 .owner = THIS_MODULE,
@@ -342,20 +337,18 @@ static int __init ti_init(void)
342 ti_id_table_combined[c].match_flags = USB_DEVICE_ID_MATCH_DEVICE; 337 ti_id_table_combined[c].match_flags = USB_DEVICE_ID_MATCH_DEVICE;
343 } 338 }
344 339
345 ret = usb_serial_register_drivers(&ti_usb_driver, serial_drivers); 340 ret = usb_serial_register_drivers(serial_drivers, KBUILD_MODNAME, ti_id_table_combined);
346 if (ret == 0) 341 if (ret == 0)
347 printk(KERN_INFO KBUILD_MODNAME ": " TI_DRIVER_VERSION ":" 342 printk(KERN_INFO KBUILD_MODNAME ": " TI_DRIVER_VERSION ":"
348 TI_DRIVER_DESC "\n"); 343 TI_DRIVER_DESC "\n");
349 return ret; 344 return ret;
350} 345}
351 346
352
353static void __exit ti_exit(void) 347static void __exit ti_exit(void)
354{ 348{
355 usb_serial_deregister_drivers(&ti_usb_driver, serial_drivers); 349 usb_serial_deregister_drivers(serial_drivers);
356} 350}
357 351
358
359module_init(ti_init); 352module_init(ti_init);
360module_exit(ti_exit); 353module_exit(ti_exit);
361 354