From 26e5d29d3e48b3a783fde953eb4a1ef5d597de6a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 18 Sep 2012 17:00:48 +0100 Subject: [PATCH] --- yaml --- r: 326111 b: refs/heads/master c: 7663e3088dcf810435c644f73bd2909362b8dc49 h: refs/heads/master i: 326109: 9660e901d254f01f4c68b2d94924187d1facf9cc 326107: 3bd2afd459600cba61fbc4efb6e2fcbd6ac304fe 326103: 03d33a1cf3a5a84f0482946de36404945c05b7cd 326095: bbffdaf44384be0501540008b02fd73fe6b0c64c 326079: f8af581fa15b35d92d4e5e376cd214c4f0a55a8f v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ir-usb.c | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index cc608779d1bc..746c45d99c11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9bb03dc89c1d63e307cb0bad60b5f6faa16af6f +refs/heads/master: 7663e3088dcf810435c644f73bd2909362b8dc49 diff --git a/trunk/drivers/usb/serial/ir-usb.c b/trunk/drivers/usb/serial/ir-usb.c index 7b7319d3a813..4ac3a3a50cfb 100644 --- a/trunk/drivers/usb/serial/ir-usb.c +++ b/trunk/drivers/usb/serial/ir-usb.c @@ -38,10 +38,6 @@ #include #include -/* - * Version Information - */ -#define DRIVER_VERSION "v0.5" #define DRIVER_AUTHOR "Greg Kroah-Hartman , Johan Hovold " #define DRIVER_DESC "USB IR Dongle driver" @@ -428,18 +424,12 @@ static void ir_set_termios(struct tty_struct *tty, static int __init ir_init(void) { - int retval; - if (buffer_size) { ir_device.bulk_in_size = buffer_size; ir_device.bulk_out_size = buffer_size; } - retval = usb_serial_register_drivers(serial_drivers, KBUILD_MODNAME, ir_id_table); - if (retval == 0) - printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" - DRIVER_DESC "\n"); - return retval; + return usb_serial_register_drivers(serial_drivers, KBUILD_MODNAME, ir_id_table); } static void __exit ir_exit(void)