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 <ker...@esmil.dk>
---
 drivers/mmc/host/omap.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 6aa0537f1f84..5e5af34090f1 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -878,9 +878,9 @@ static void mmc_omap_cover_timer(struct timer_list *t)
        tasklet_schedule(&slot->cover_tasklet);
 }
 
-static void mmc_omap_cover_handler(unsigned long param)
+static void mmc_omap_cover_handler(struct tasklet_struct *t)
 {
-       struct mmc_omap_slot *slot = (struct mmc_omap_slot *)param;
+       struct mmc_omap_slot *slot = from_tasklet(slot, t, cover_tasklet);
        int cover_open = mmc_omap_cover_is_open(slot);
 
        mmc_detect_change(slot->mmc, 0);
@@ -1269,8 +1269,7 @@ static int mmc_omap_new_slot(struct mmc_omap_host *host, 
int id)
 
        if (slot->pdata->get_cover_state != NULL) {
                timer_setup(&slot->cover_timer, mmc_omap_cover_timer, 0);
-               tasklet_init(&slot->cover_tasklet, mmc_omap_cover_handler,
-                            (unsigned long)slot);
+               tasklet_setup(&slot->cover_tasklet, mmc_omap_cover_handler);
        }
 
        r = mmc_add_host(mmc);
-- 
2.30.0

Reply via email to