diff options
author | Aya Mahfouz <mahfouz.saif.elyazal@gmail.com> | 2015-02-19 07:58:29 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-26 13:12:40 -0800 |
commit | 8f6e36c55a7fc445c584711ff8eea9261f1285cb (patch) | |
tree | 1654a784f619bb739430522c923f019068b08b08 /drivers/staging/panel/panel.c | |
parent | staging: dgnc: replace init_timer by setup_timer (diff) | |
download | linux-dev-8f6e36c55a7fc445c584711ff8eea9261f1285cb.tar.xz linux-dev-8f6e36c55a7fc445c584711ff8eea9261f1285cb.zip |
staging: panel: 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: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/panel/panel.c')
-rw-r--r-- | drivers/staging/panel/panel.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c index 6ed35b6ecf0d..4da854ca3115 100644 --- a/drivers/staging/panel/panel.c +++ b/drivers/staging/panel/panel.c @@ -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); } |