Commit 38e0c9d2 authored by Aya Mahfouz's avatar Aya Mahfouz Committed by Greg Kroah-Hartman

staging: dgnc: replace init_timer by setup_timer

This patch replaces init_timer and the 2 step initialization of function
and data by setup_timer to make the code more concise.

The issue was discovered using the following coccinelle script:

@@
expression ds, e1, e2;
@@

-init_timer (&ds);
+setup_timer (&ds, e1, e2);
...
(
-ds.function = e1;
...
-ds.data = e2;
|
-ds.data = e2;
...
-ds.function = e1;
)
Signed-off-by: default avatarAya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2f83aeda
...@@ -285,9 +285,7 @@ static int dgnc_start(void) ...@@ -285,9 +285,7 @@ static int dgnc_start(void)
/* Start the poller */ /* Start the poller */
spin_lock_irqsave(&dgnc_poll_lock, flags); spin_lock_irqsave(&dgnc_poll_lock, flags);
init_timer(&dgnc_poll_timer); setup_timer(&dgnc_poll_timer, dgnc_poll_handler, 0);
dgnc_poll_timer.function = dgnc_poll_handler;
dgnc_poll_timer.data = 0;
dgnc_poll_time = jiffies + dgnc_jiffies_from_ms(dgnc_poll_tick); dgnc_poll_time = jiffies + dgnc_jiffies_from_ms(dgnc_poll_tick);
dgnc_poll_timer.expires = dgnc_poll_time; dgnc_poll_timer.expires = dgnc_poll_time;
spin_unlock_irqrestore(&dgnc_poll_lock, flags); spin_unlock_irqrestore(&dgnc_poll_lock, flags);
...@@ -733,9 +731,7 @@ static void dgnc_poll_handler(ulong dummy) ...@@ -733,9 +731,7 @@ static void dgnc_poll_handler(ulong dummy)
if ((ulong) new_time >= 2 * dgnc_poll_tick) if ((ulong) new_time >= 2 * dgnc_poll_tick)
dgnc_poll_time = jiffies + dgnc_jiffies_from_ms(dgnc_poll_tick); dgnc_poll_time = jiffies + dgnc_jiffies_from_ms(dgnc_poll_tick);
init_timer(&dgnc_poll_timer); setup_timer(&dgnc_poll_timer, dgnc_poll_handler, 0);
dgnc_poll_timer.function = dgnc_poll_handler;
dgnc_poll_timer.data = 0;
dgnc_poll_timer.expires = dgnc_poll_time; dgnc_poll_timer.expires = dgnc_poll_time;
spin_unlock_irqrestore(&dgnc_poll_lock, flags); spin_unlock_irqrestore(&dgnc_poll_lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment