[media] s2255drv: Use setup_timer
authorJulia Lawall <Julia.Lawall@lip6.fr>
Fri, 26 Dec 2014 14:35:33 +0000 (11:35 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 27 Jan 2015 12:04:18 +0000 (10:04 -0200)
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>
drivers/media/usb/s2255/s2255drv.c

index de55e96fed153b1f358115cc970501af9290644c..0f3c34d47ec3f1063928aafab20d6fc2b56d1882 100644 (file)
@@ -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];