mmc: cb710: 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>
Acked-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Link: https://lore.kernel.org/r/20210208134551.39696-1-kernel@esmil.dk
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/cb710-mmc.c b/drivers/mmc/host/cb710-mmc.c
index e84ed84ea4ccbe150c9fc61a400d34af1799f10c..6d623b2681c32629d8e2b0d0f52d67093df16936 100644 (file)
--- a/drivers/mmc/host/cb710-mmc.c
+++ b/drivers/mmc/host/cb710-mmc.c
@@ -646,14 +646,14 @@ static int cb710_mmc_irq_handler(struct cb710_slot *slot)
        return 1;
 }
 
-static void cb710_mmc_finish_request_tasklet(unsigned long data)
+static void cb710_mmc_finish_request_tasklet(struct tasklet_struct *t)
 {
-       struct mmc_host *mmc = (void *)data;
-       struct cb710_mmc_reader *reader = mmc_priv(mmc);
+       struct cb710_mmc_reader *reader = from_tasklet(reader, t,
+                                                      finish_req_tasklet);
        struct mmc_request *mrq = reader->mrq;
 
        reader->mrq = NULL;
-       mmc_request_done(mmc, mrq);
+       mmc_request_done(mmc_from_priv(reader), mrq);
 }
 
 static const struct mmc_host_ops cb710_mmc_host = {
@@ -718,8 +718,8 @@ static int cb710_mmc_init(struct platform_device *pdev)
 
        reader = mmc_priv(mmc);
 
-       tasklet_init(&reader->finish_req_tasklet,
-               cb710_mmc_finish_request_tasklet, (unsigned long)mmc);
+       tasklet_setup(&reader->finish_req_tasklet,
+                     cb710_mmc_finish_request_tasklet);
        spin_lock_init(&reader->irq_lock);
        cb710_dump_regs(chip, CB710_DUMP_REGS_MMC);