]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: panel: replace init_timer by setup_timer
authorAya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Thu, 19 Feb 2015 05:58:29 +0000 (07:58 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Feb 2015 21:12:40 +0000 (13:12 -0800)
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: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/panel/panel.c

index 6ed35b6ecf0d1a3bf2795d4dd5d01678aa365bf7..4da854ca311529b17723cbfe30ce78bab240436a 100644 (file)
@@ -2010,10 +2010,8 @@ static void init_scan_timer(void)
        if (scan_timer.function != NULL)
                return;         /* already started */
 
-       init_timer(&scan_timer);
+       setup_timer(&scan_timer, (void *)&panel_scan_timer, 0);
        scan_timer.expires = jiffies + INPUT_POLL_TIME;
-       scan_timer.data = 0;
-       scan_timer.function = (void *)&panel_scan_timer;
        add_timer(&scan_timer);
 }