diff options
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index dcc05fdb01bc..8742a0ee2091 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -48,10 +48,6 @@ | |||
48 | #include "ftdi_sio.h" | 48 | #include "ftdi_sio.h" |
49 | #include "ftdi_sio_ids.h" | 49 | #include "ftdi_sio_ids.h" |
50 | 50 | ||
51 | /* | ||
52 | * Version Information | ||
53 | */ | ||
54 | #define DRIVER_VERSION "v1.6.0" | ||
55 | #define DRIVER_AUTHOR "Greg Kroah-Hartman <greg@kroah.com>, Bill Ryder <bryder@sgi.com>, Kuba Ober <kuba@mareimbrium.org>, Andreas Mohr, Johan Hovold <jhovold@gmail.com>" | 51 | #define DRIVER_AUTHOR "Greg Kroah-Hartman <greg@kroah.com>, Bill Ryder <bryder@sgi.com>, Kuba Ober <kuba@mareimbrium.org>, Andreas Mohr, Johan Hovold <jhovold@gmail.com>" |
56 | #define DRIVER_DESC "USB FTDI Serial Converters Driver" | 52 | #define DRIVER_DESC "USB FTDI Serial Converters Driver" |
57 | 53 | ||
@@ -2419,8 +2415,6 @@ static int ftdi_ioctl(struct tty_struct *tty, | |||
2419 | 2415 | ||
2420 | static int __init ftdi_init(void) | 2416 | static int __init ftdi_init(void) |
2421 | { | 2417 | { |
2422 | int retval; | ||
2423 | |||
2424 | if (vendor > 0 && product > 0) { | 2418 | if (vendor > 0 && product > 0) { |
2425 | /* Add user specified VID/PID to reserved element of table. */ | 2419 | /* Add user specified VID/PID to reserved element of table. */ |
2426 | int i; | 2420 | int i; |
@@ -2430,11 +2424,7 @@ static int __init ftdi_init(void) | |||
2430 | id_table_combined[i].idVendor = vendor; | 2424 | id_table_combined[i].idVendor = vendor; |
2431 | id_table_combined[i].idProduct = product; | 2425 | id_table_combined[i].idProduct = product; |
2432 | } | 2426 | } |
2433 | retval = usb_serial_register_drivers(serial_drivers, KBUILD_MODNAME, id_table_combined); | 2427 | return usb_serial_register_drivers(serial_drivers, KBUILD_MODNAME, id_table_combined); |
2434 | if (retval == 0) | ||
2435 | printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" | ||
2436 | DRIVER_DESC "\n"); | ||
2437 | return retval; | ||
2438 | } | 2428 | } |
2439 | 2429 | ||
2440 | static void __exit ftdi_exit(void) | 2430 | static void __exit ftdi_exit(void) |