Merge tag 'iwlwifi-next-for-kalle-2015-05-03' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / pcmcia / omap_cf.c

diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index 8170102..4e2f501 100644 (file)
--- 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)
        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);