1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index 58d74b8d6c79..210247b3d11a 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -508,9 +508,9 @@ static irqreturn_t mvsd_irq(int irq, void *dev)
         return IRQ_NONE;
 }
 
-static void mvsd_timeout_timer(unsigned long data)
+static void mvsd_timeout_timer(struct timer_list *t)
 {
-        struct mvsd_host *host = (struct mvsd_host *)data;
+        struct mvsd_host *host = from_timer(host, t, timer);
         void __iomem *iobase = host->base;
         struct mmc_request *mrq;
         unsigned long flags;
@@ -776,7 +776,7 @@ static int mvsd_probe(struct platform_device *pdev)
                 goto out;
         }
 
-        setup_timer(&host->timer, mvsd_timeout_timer, (unsigned long)host);
+        timer_setup(&host->timer, mvsd_timeout_timer, 0);
         platform_set_drvdata(pdev, mmc);
         ret = mmc_add_host(mmc);
         if (ret)