diff options
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index e0e2b94e7833..8c084ea34e26 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -862,11 +862,6 @@ static struct usb_device_id id_table_combined [] = { | |||
862 | 862 | ||
863 | MODULE_DEVICE_TABLE(usb, id_table_combined); | 863 | MODULE_DEVICE_TABLE(usb, id_table_combined); |
864 | 864 | ||
865 | static struct usb_driver ftdi_driver = { | ||
866 | .name = "ftdi_sio", | ||
867 | .id_table = id_table_combined, | ||
868 | }; | ||
869 | |||
870 | static const char *ftdi_chip_name[] = { | 865 | static const char *ftdi_chip_name[] = { |
871 | [SIO] = "SIO", /* the serial part of FT8U100AX */ | 866 | [SIO] = "SIO", /* the serial part of FT8U100AX */ |
872 | [FT8U232AM] = "FT8U232AM", | 867 | [FT8U232AM] = "FT8U232AM", |
@@ -2413,7 +2408,7 @@ static int __init ftdi_init(void) | |||
2413 | id_table_combined[i].idVendor = vendor; | 2408 | id_table_combined[i].idVendor = vendor; |
2414 | id_table_combined[i].idProduct = product; | 2409 | id_table_combined[i].idProduct = product; |
2415 | } | 2410 | } |
2416 | retval = usb_serial_register_drivers(&ftdi_driver, serial_drivers); | 2411 | retval = usb_serial_register_drivers(serial_drivers, KBUILD_MODNAME, id_table_combined); |
2417 | if (retval == 0) | 2412 | if (retval == 0) |
2418 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" | 2413 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" |
2419 | DRIVER_DESC "\n"); | 2414 | DRIVER_DESC "\n"); |
@@ -2422,7 +2417,7 @@ static int __init ftdi_init(void) | |||
2422 | 2417 | ||
2423 | static void __exit ftdi_exit(void) | 2418 | static void __exit ftdi_exit(void) |
2424 | { | 2419 | { |
2425 | usb_serial_deregister_drivers(&ftdi_driver, serial_drivers); | 2420 | usb_serial_deregister_drivers(serial_drivers); |
2426 | } | 2421 | } |
2427 | 2422 | ||
2428 | 2423 | ||