diff options
| author | Aya Mahfouz <mahfouz.saif.elyazal@gmail.com> | 2015-02-19 21:14:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-26 12:31:53 -0800 |
| commit | 9a9bdd689c12d09fe2554947b053f8964e28e440 (patch) | |
| tree | 7fbe863a94aa7a4b6673bcba28ed935e04c3b840 /drivers/staging/comedi/drivers/comedi_test.c | |
| parent | b4c2c314c140611f3f9c1496a60e55174ba96da7 (diff) | |
staging: comedi: drivers: replace init_timer by setup_timer
This patch replaces init_timer and 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;
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/comedi_test.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/comedi_test.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c index e56525a1c8f3..fbc43420f698 100644 --- a/drivers/staging/comedi/drivers/comedi_test.c +++ b/drivers/staging/comedi/drivers/comedi_test.c @@ -420,9 +420,8 @@ static int waveform_attach(struct comedi_device *dev, for (i = 0; i < s->n_chan; i++) devpriv->ao_loopbacks[i] = s->maxdata / 2; - init_timer(&devpriv->timer); - devpriv->timer.function = waveform_ai_interrupt; - devpriv->timer.data = (unsigned long)dev; + setup_timer(&devpriv->timer, waveform_ai_interrupt, + (unsigned long)dev); dev_info(dev->class_dev, "%s: %i microvolt, %li microsecond waveform attached\n", |