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

Commit dae6cdab authored by Vaishali Thakkar's avatar Vaishali Thakkar Committed by Greg Kroah-Hartman
Browse files

pcmcia: Use setup_timer 



This patch introduces the use of function setup_timer.

This is done using Coccinelle and semantic patch used is
as follows:

@@
expression x,y,z;
@@

- init_timer (&x);
+ setup_timer (&x, y, z);
- x.function = y;
- x.data = z;

Signed-off-by: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ab163ad

drivers/pcmcia/omap_cf.c

+1 −3
Original line number Diff line number Diff line
@@ -220,9 +220,7 @@ static int __init omap_cf_probe(struct platform_device *pdev) 
	cf = kzalloc(sizeof *cf, GFP_KERNEL);

	if (!cf)

		return -ENOMEM;

	init_timer(&cf->timer);

	cf->timer.function = omap_cf_timer;

	cf->timer.data = (unsigned long) cf;

	setup_timer(&cf->timer, omap_cf_timer, (unsigned long)cf);



	cf->pdev = pdev;

	platform_set_drvdata(pdev, cf);

drivers/pcmcia/soc_common.c

+2 −3
Original line number Diff line number Diff line
@@ -726,9 +726,8 @@ int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt) 
{

	int ret;



	init_timer(&skt->poll_timer);

	skt->poll_timer.function = soc_common_pcmcia_poll_event;

	skt->poll_timer.data = (unsigned long)skt;

	setup_timer(&skt->poll_timer, soc_common_pcmcia_poll_event,

		    (unsigned long)skt);

	skt->poll_timer.expires = jiffies + SOC_PCMCIA_POLL_PERIOD;



	ret = request_resource(&iomem_resource, &skt->res_skt);