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>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
08a4f6bc2e
commit
97b6b6d233
@@ -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);
|
||||
|
Reference in New Issue
Block a user