Merge tag 'usb-serial-4.2-rc1' of git://git.kernel.org/pub/scm/linux/…

…kernel/git/johan/usb-serial into usb-next Johan writes: USB-serial updates for v4.2-rc1 Just a minor clean up of mos7840 this time. Signed-off-by: Johan Hovold <[email protected]>
jobinthepast · Jun 5, 2015 · 4e47dcf · 4e47dcf
2 parents b3d424e + f05b7cb
commit 4e47dcf
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
@@ -2301,17 +2301,14 @@ static int mos7840_port_probe(struct usb_serial_port *port)
 			goto error;
 		}
 
-		init_timer(&mos7840_port->led_timer1);
-		mos7840_port->led_timer1.function = mos7840_led_off;
+		setup_timer(&mos7840_port->led_timer1, mos7840_led_off,
+			    (unsigned long)mos7840_port);
 		mos7840_port->led_timer1.expires =
 			jiffies + msecs_to_jiffies(LED_ON_MS);
-		mos7840_port->led_timer1.data = (unsigned long)mos7840_port;
-
-		init_timer(&mos7840_port->led_timer2);
-		mos7840_port->led_timer2.function = mos7840_led_flag_off;
+		setup_timer(&mos7840_port->led_timer2, mos7840_led_flag_off,
+			    (unsigned long)mos7840_port);
 		mos7840_port->led_timer2.expires =
 			jiffies + msecs_to_jiffies(LED_OFF_MS);
-		mos7840_port->led_timer2.data = (unsigned long)mos7840_port;
 
 		/* Turn off LED */
 		mos7840_set_led_sync(port, MODEM_CONTROL_REGISTER, 0x0300);