diff options
| author | Julia Lawall <Julia.Lawall@lip6.fr> | 2014-12-26 17:35:33 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-01-27 15:04:18 +0300 |
| commit | 8bf554cafdc9292633af89b3401f2aa62719b591 (patch) | |
| tree | d12b7ad0fc24c42bdfa42c2c04efb0fd4d2cac34 /drivers/media/usb/s2255 | |
| parent | 30a8f2a08dfe61b3447476cf124d07c892f3ade0 (diff) | |
| download | linux-8bf554cafdc9292633af89b3401f2aa62719b591.tar.xz | |
[media] s2255drv: Use setup_timer
Convert a call to init_timer and accompanying intializations of
the timer's data and function fields to a call to setup_timer.
A simplified version of the semantic match that fixes this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression t,f,d;
@@
-init_timer(&t);
+setup_timer(&t,f,d);
-t.function = f;
-t.data = d;
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/s2255')
| -rw-r--r-- | drivers/media/usb/s2255/s2255drv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c index de55e96fed15..0f3c34d47ec3 100644 --- a/drivers/media/usb/s2255/s2255drv.c +++ b/drivers/media/usb/s2255/s2255drv.c @@ -2274,9 +2274,7 @@ static int s2255_probe(struct usb_interface *interface, dev_err(&interface->dev, "Could not find bulk-in endpoint\n"); goto errorEP; } - init_timer(&dev->timer); - dev->timer.function = s2255_timer; - dev->timer.data = (unsigned long)dev->fw_data; + setup_timer(&dev->timer, s2255_timer, (unsigned long)dev->fw_data); init_waitqueue_head(&dev->fw_data->wait_fw); for (i = 0; i < MAX_CHANNELS; i++) { struct s2255_vc *vc = &dev->vc[i]; |