Commit 2049f1ea authored Mar 11, 2015 by Somya Anand Committed by Greg Kroah-Hartman Mar 16, 2015

Staging: dgap: Use setup_timer to combine initialization



The function setup_timer combines the initialization of a timer with the
initialization of the timer's function and data fields.

So, this patch combines the multiline code for timer initialization using the function
setup_timer. This issue is identified via coccinelle script.

@@
expression E1, E2, E3;
type T;
@@
- init_timer(&E1);
...
(
- E1.function = E2;
...
- E1.data = (T)E3;
+ setup_timer(&E1, E2, (T)E3);
|
- E1.data = (T)E3;
...
- E1.function = E2;
+ setup_timer(&E1, E2, (T)E3);
|
- E1.function = E2;
+ setup_timer(&E1, E2, 0);
)

Signed-off-by: Somya Anand <somyaanand214@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent dc6ed26d

drivers/staging/dgap/dgap.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -7039,8 +7039,7 @@ static int dgap_start(void)

		/* Start the poller */
		spin_lock_irqsave(&dgap_poll_lock, flags);
		init_timer(&dgap_poll_timer);
		dgap_poll_timer.function = dgap_poll_handler;
		setup_timer(&dgap_poll_timer, dgap_poll_handler, 0);
		dgap_poll_timer.data = 0;
		dgap_poll_time = jiffies + dgap_jiffies_from_ms(dgap_poll_tick);
		dgap_poll_timer.expires = dgap_poll_time;