aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorVaishali Thakkar <vthakkar1994@gmail.com>2015-06-01 06:41:57 +0530
committerJohan Hovold <johan@kernel.org>2015-06-01 16:39:41 +0200
commitf05b7cb6f2beed0869669cc4748341560eba2aef (patch)
treebc395ecefb92bccdc4e0d88dba1e424046435f27 /drivers/usb
parentLinux 4.1-rc4 (diff)
downloadlinux-dev-f05b7cb6f2beed0869669cc4748341560eba2aef.tar.xz
linux-dev-f05b7cb6f2beed0869669cc4748341560eba2aef.zip
USB: serial: mos7840: Use setup_timer
Use the timer API function setup_timer instead of structure field assignments to initialize a timer. A simplified version of the Coccinelle semantic patch that performs this transformation is as follows: @change@ expression e1, e2, e3, e4, a, b; @@ -init_timer(&e1); +setup_timer(&e1, a, b); ... when != a = e2 when != b = e3 -e1.function = a; ... when != b = e4 -e1.data = b; Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com> Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/mos7840.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index e4473a9109cf..8ac9b55f05af 100644
--- 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);