diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2012-02-23 14:56:32 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-24 12:39:18 -0800 |
| commit | 97b6b6d2339f67eb17d954930a908b762af66228 (patch) | |
| tree | 955eb92c831f444e26a930b3cd301393bb7112a0 /drivers/usb/serial/funsoft.c | |
| parent | 08a4f6bc2e7046ce50849d7589b7d0763926d808 (diff) | |
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 <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/funsoft.c')
| -rw-r--r-- | drivers/usb/serial/funsoft.c | 19 |
1 files changed, 6 insertions, 13 deletions
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); |