|
@@ -1201,17 +1201,6 @@ static const struct tty_operations serial_ops = {
|
|
|
|
|
|
struct tty_driver *usb_serial_tty_driver;
|
|
struct tty_driver *usb_serial_tty_driver;
|
|
|
|
|
|
-/* Driver structure we register with the USB core */
|
|
|
|
-static struct usb_driver usb_serial_driver = {
|
|
|
|
- .name = "usbserial",
|
|
|
|
- .probe = usb_serial_probe,
|
|
|
|
- .disconnect = usb_serial_disconnect,
|
|
|
|
- .suspend = usb_serial_suspend,
|
|
|
|
- .resume = usb_serial_resume,
|
|
|
|
- .no_dynamic_id = 1,
|
|
|
|
- .supports_autosuspend = 1,
|
|
|
|
-};
|
|
|
|
-
|
|
|
|
static int __init usb_serial_init(void)
|
|
static int __init usb_serial_init(void)
|
|
{
|
|
{
|
|
int result;
|
|
int result;
|
|
@@ -1247,13 +1236,6 @@ static int __init usb_serial_init(void)
|
|
goto exit_reg_driver;
|
|
goto exit_reg_driver;
|
|
}
|
|
}
|
|
|
|
|
|
- /* register the USB driver */
|
|
|
|
- result = usb_register(&usb_serial_driver);
|
|
|
|
- if (result < 0) {
|
|
|
|
- pr_err("%s - usb_register failed\n", __func__);
|
|
|
|
- goto exit_tty;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
/* register the generic driver, if we should */
|
|
/* register the generic driver, if we should */
|
|
result = usb_serial_generic_register();
|
|
result = usb_serial_generic_register();
|
|
if (result < 0) {
|
|
if (result < 0) {
|
|
@@ -1264,9 +1246,6 @@ static int __init usb_serial_init(void)
|
|
return result;
|
|
return result;
|
|
|
|
|
|
exit_generic:
|
|
exit_generic:
|
|
- usb_deregister(&usb_serial_driver);
|
|
|
|
-
|
|
|
|
-exit_tty:
|
|
|
|
tty_unregister_driver(usb_serial_tty_driver);
|
|
tty_unregister_driver(usb_serial_tty_driver);
|
|
|
|
|
|
exit_reg_driver:
|
|
exit_reg_driver:
|
|
@@ -1285,7 +1264,6 @@ static void __exit usb_serial_exit(void)
|
|
|
|
|
|
usb_serial_generic_deregister();
|
|
usb_serial_generic_deregister();
|
|
|
|
|
|
- usb_deregister(&usb_serial_driver);
|
|
|
|
tty_unregister_driver(usb_serial_tty_driver);
|
|
tty_unregister_driver(usb_serial_tty_driver);
|
|
put_tty_driver(usb_serial_tty_driver);
|
|
put_tty_driver(usb_serial_tty_driver);
|
|
bus_unregister(&usb_serial_bus_type);
|
|
bus_unregister(&usb_serial_bus_type);
|