mmc: via-sdmmc: Use new tasklet API

This converts the driver to use the new tasklet API introduced in
commit 12cc923f1ccc ("tasklet: Introduce new initialization API")

Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
Link: https://lore.kernel.org/r/20210204151847.91353-9-kernel@esmil.dk
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c
index 9b755ea0fa03cc912ea4ebfe81058a95f3204c10..4f4c0813f9fdccb9241da0f7352f033d308760a5 100644 (file)
--- a/drivers/mmc/host/via-sdmmc.c
+++ b/drivers/mmc/host/via-sdmmc.c
@@ -959,14 +959,12 @@ static void via_sdc_timeout(struct timer_list *t)
        spin_unlock_irqrestore(&sdhost->lock, flags);
 }
 
-static void via_sdc_tasklet_finish(unsigned long param)
+static void via_sdc_tasklet_finish(struct tasklet_struct *t)
 {
-       struct via_crdr_mmc_host *host;
+       struct via_crdr_mmc_host *host = from_tasklet(host, t, finish_tasklet);
        unsigned long flags;
        struct mmc_request *mrq;
 
-       host = (struct via_crdr_mmc_host *)param;
-
        spin_lock_irqsave(&host->lock, flags);
 
        del_timer(&host->timer);
@@ -1050,8 +1048,7 @@ static void via_init_mmc_host(struct via_crdr_mmc_host *host)
 
        INIT_WORK(&host->carddet_work, via_sdc_card_detect);
 
-       tasklet_init(&host->finish_tasklet, via_sdc_tasklet_finish,
-                    (unsigned long)host);
+       tasklet_setup(&host->finish_tasklet, via_sdc_tasklet_finish);
 
        addrbase = host->sdhc_mmiobase;
        writel(0x0, addrbase + VIA_CRDR_SDINTMASK);