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: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Vaishali Thakkar 2015-02-11 16:25:38 +05:30 committed by Greg Kroah-Hartman
parent 0ab163ad1e
commit dae6cdabe4
2 changed files with 3 additions and 6 deletions

View File

@ -220,9 +220,7 @@ static int __init omap_cf_probe(struct platform_device *pdev)
cf = kzalloc(sizeof *cf, GFP_KERNEL); cf = kzalloc(sizeof *cf, GFP_KERNEL);
if (!cf) if (!cf)
return -ENOMEM; return -ENOMEM;
init_timer(&cf->timer); setup_timer(&cf->timer, omap_cf_timer, (unsigned long)cf);
cf->timer.function = omap_cf_timer;
cf->timer.data = (unsigned long) cf;
cf->pdev = pdev; cf->pdev = pdev;
platform_set_drvdata(pdev, cf); platform_set_drvdata(pdev, cf);

View File

@ -726,9 +726,8 @@ int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt)
{ {
int ret; int ret;
init_timer(&skt->poll_timer); setup_timer(&skt->poll_timer, soc_common_pcmcia_poll_event,
skt->poll_timer.function = soc_common_pcmcia_poll_event; (unsigned long)skt);
skt->poll_timer.data = (unsigned long)skt;
skt->poll_timer.expires = jiffies + SOC_PCMCIA_POLL_PERIOD; skt->poll_timer.expires = jiffies + SOC_PCMCIA_POLL_PERIOD;
ret = request_resource(&iomem_resource, &skt->res_skt); ret = request_resource(&iomem_resource, &skt->res_skt);