]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[media] au0828: Use setup_timer
authorJulia Lawall <Julia.Lawall@lip6.fr>
Fri, 26 Dec 2014 14:35:32 +0000 (11:35 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 27 Jan 2015 12:03:59 +0000 (10:03 -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;
@@

-t.function = f;
-t.data = d;
-init_timer(&t);
+setup_timer(&t,f,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/au0828/au0828-video.c

index 8a7a54750aeed2b5ae139d480b393a747cae1769..60a68460045627557365b7ff5c23c4cb40f99395 100644 (file)
@@ -2042,13 +2042,10 @@ int au0828_analog_register(struct au0828_dev *dev,
        INIT_LIST_HEAD(&dev->vbiq.active);
        INIT_LIST_HEAD(&dev->vbiq.queued);
 
-       dev->vid_timeout.function = au0828_vid_buffer_timeout;
-       dev->vid_timeout.data = (unsigned long) dev;
-       init_timer(&dev->vid_timeout);
-
-       dev->vbi_timeout.function = au0828_vbi_buffer_timeout;
-       dev->vbi_timeout.data = (unsigned long) dev;
-       init_timer(&dev->vbi_timeout);
+       setup_timer(&dev->vid_timeout, au0828_vid_buffer_timeout,
+                   (unsigned long)dev);
+       setup_timer(&dev->vbi_timeout, au0828_vbi_buffer_timeout,
+                   (unsigned long)dev);
 
        dev->width = NTSC_STD_W;
        dev->height = NTSC_STD_H;