summary refs log tree commit diff
path: root/drivers/pcmcia/soc_common.c
diff options
context:
space:
mode:
authorVaishali Thakkar <vthakkar1994@gmail.com>2015-02-11 16:25:38 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-16 21:31:43 +0100
commitdae6cdabe45baecfcfd02fbf11d97bb645450fc6 (patch)
tree840c6279f9ec735435a48e41dfacd7375b324d0c /drivers/pcmcia/soc_common.c
parent0ab163ad1ea0bb0ccd4ada2a54834041611d76f1 (diff)
downloadlinux-dae6cdabe45baecfcfd02fbf11d97bb645450fc6.tar.gz
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>
Diffstat (limited to 'drivers/pcmcia/soc_common.c')
-rw-r--r--drivers/pcmcia/soc_common.c5
1 files changed, 2 insertions, 3 deletions
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)
 {
 	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);