From 9660e901d254f01f4c68b2d94924187d1facf9cc Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 18 Sep 2012 16:57:35 +0100 Subject: [PATCH] --- yaml --- r: 326109 b: refs/heads/master c: 1a71bd2e9731f04a72712aea936627b453233e1e h: refs/heads/master i: 326107: 3bd2afd459600cba61fbc4efb6e2fcbd6ac304fe v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ftdi_sio.c | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index a77688b425aa..f1671ae05d1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6ab0158007e5ed9108fd74fe0f61b5b2a326eb9 +refs/heads/master: 1a71bd2e9731f04a72712aea936627b453233e1e diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c index dcc05fdb01bc..8742a0ee2091 100644 --- a/trunk/drivers/usb/serial/ftdi_sio.c +++ b/trunk/drivers/usb/serial/ftdi_sio.c @@ -48,10 +48,6 @@ #include "ftdi_sio.h" #include "ftdi_sio_ids.h" -/* - * Version Information - */ -#define DRIVER_VERSION "v1.6.0" #define DRIVER_AUTHOR "Greg Kroah-Hartman , Bill Ryder , Kuba Ober , Andreas Mohr, Johan Hovold " #define DRIVER_DESC "USB FTDI Serial Converters Driver" @@ -2419,8 +2415,6 @@ static int ftdi_ioctl(struct tty_struct *tty, static int __init ftdi_init(void) { - int retval; - if (vendor > 0 && product > 0) { /* Add user specified VID/PID to reserved element of table. */ int i; @@ -2430,11 +2424,7 @@ static int __init ftdi_init(void) id_table_combined[i].idVendor = vendor; id_table_combined[i].idProduct = product; } - retval = usb_serial_register_drivers(serial_drivers, KBUILD_MODNAME, id_table_combined); - if (retval == 0) - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" - DRIVER_DESC "\n"); - return retval; + return usb_serial_register_drivers(serial_drivers, KBUILD_MODNAME, id_table_combined); } static void __exit ftdi_exit(void)