usb-serial: use new registration API in [t-z]* drivers
This patch (as1529) modifies the following usb-serial drivers to utilize the new usb_serial_{de}register_drivers() routines: ti_usb_3410_5052, usb_debug, visor, vivopay-serial, whiteheat, and zio. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committad av
Greg Kroah-Hartman

förälder
d860322f34
incheckning
29618e9fb5
@@ -30,7 +30,6 @@ static struct usb_driver vivopay_serial_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static struct usb_serial_driver vivopay_serial_device = {
|
||||
@@ -39,32 +38,28 @@ static struct usb_serial_driver vivopay_serial_device = {
|
||||
.name = "vivopay-serial",
|
||||
},
|
||||
.id_table = id_table,
|
||||
.usb_driver = &vivopay_serial_driver,
|
||||
.num_ports = 1,
|
||||
};
|
||||
|
||||
static struct usb_serial_driver * const serial_drivers[] = {
|
||||
&vivopay_serial_device, NULL
|
||||
};
|
||||
|
||||
static int __init vivopay_serial_init(void)
|
||||
{
|
||||
int retval;
|
||||
retval = usb_serial_register(&vivopay_serial_device);
|
||||
if (retval)
|
||||
goto failed_usb_serial_register;
|
||||
retval = usb_register(&vivopay_serial_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(&vivopay_serial_device);
|
||||
failed_usb_serial_register:
|
||||
|
||||
retval = usb_serial_register_drivers(&vivopay_serial_driver,
|
||||
serial_drivers);
|
||||
if (retval == 0)
|
||||
printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
|
||||
DRIVER_DESC "\n");
|
||||
return retval;
|
||||
}
|
||||
|
||||
static void __exit vivopay_serial_exit(void)
|
||||
{
|
||||
usb_deregister(&vivopay_serial_driver);
|
||||
usb_serial_deregister(&vivopay_serial_device);
|
||||
usb_serial_deregister_drivers(&vivopay_serial_driver, serial_drivers);
|
||||
}
|
||||
|
||||
module_init(vivopay_serial_init);
|
||||
|
Referens i nytt ärende
Block a user