diff options
author | Vaishali Thakkar <vthakkar1994@gmail.com> | 2015-02-11 05:55:38 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-16 16:31:43 -0400 |
commit | dae6cdabe45baecfcfd02fbf11d97bb645450fc6 (patch) | |
tree | 840c6279f9ec735435a48e41dfacd7375b324d0c | |
parent | 0ab163ad1ea0bb0ccd4ada2a54834041611d76f1 (diff) |
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>
-rw-r--r-- | drivers/pcmcia/omap_cf.c | 4 | ||||
-rw-r--r-- | drivers/pcmcia/soc_common.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c index 8170102d1e93..4e2f501e5548 100644 --- a/drivers/pcmcia/omap_cf.c +++ b/drivers/pcmcia/omap_cf.c | |||
@@ -220,9 +220,7 @@ static int __init omap_cf_probe(struct platform_device *pdev) | |||
220 | cf = kzalloc(sizeof *cf, GFP_KERNEL); | 220 | cf = kzalloc(sizeof *cf, GFP_KERNEL); |
221 | if (!cf) | 221 | if (!cf) |
222 | return -ENOMEM; | 222 | return -ENOMEM; |
223 | init_timer(&cf->timer); | 223 | setup_timer(&cf->timer, omap_cf_timer, (unsigned long)cf); |
224 | cf->timer.function = omap_cf_timer; | ||
225 | cf->timer.data = (unsigned long) cf; | ||
226 | 224 | ||
227 | cf->pdev = pdev; | 225 | cf->pdev = pdev; |
228 | platform_set_drvdata(pdev, cf); | 226 | platform_set_drvdata(pdev, cf); |
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index 933f4657515b..eed5e9c05353 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c | |||
@@ -726,9 +726,8 @@ int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt) | |||
726 | { | 726 | { |
727 | int ret; | 727 | int ret; |
728 | 728 | ||
729 | init_timer(&skt->poll_timer); | 729 | setup_timer(&skt->poll_timer, soc_common_pcmcia_poll_event, |
730 | skt->poll_timer.function = soc_common_pcmcia_poll_event; | 730 | (unsigned long)skt); |
731 | skt->poll_timer.data = (unsigned long)skt; | ||
732 | skt->poll_timer.expires = jiffies + SOC_PCMCIA_POLL_PERIOD; | 731 | skt->poll_timer.expires = jiffies + SOC_PCMCIA_POLL_PERIOD; |
733 | 732 | ||
734 | ret = request_resource(&iomem_resource, &skt->res_skt); | 733 | ret = request_resource(&iomem_resource, &skt->res_skt); |