Skip to content

Commit

Permalink
pcmcia: Use setup_timer
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
v-thakkar authored and gregkh committed Mar 16, 2015
1 parent 0ab163a commit dae6cda
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 1 addition & 3 deletions drivers/pcmcia/omap_cf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 2 additions & 3 deletions drivers/pcmcia/soc_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit dae6cda

Please sign in to comment.