Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bf554ca authored by Julia Lawall's avatar Julia Lawall Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 30a8f2a0

drivers/media/usb/s2255/s2255drv.c

+1 −3
Original line number Diff line number Diff line
@@ -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];