Skip to content

Commit e821afd

Browse files
esmilstorulf
authored andcommitted
mmc: via-sdmmc: Use new tasklet API
This converts the driver to use the new tasklet API introduced in commit 12cc923 ("tasklet: Introduce new initialization API") Signed-off-by: Emil Renner Berthing <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]>
1 parent 39d2969 commit e821afd

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

drivers/mmc/host/via-sdmmc.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -959,14 +959,12 @@ static void via_sdc_timeout(struct timer_list *t)
959959
spin_unlock_irqrestore(&sdhost->lock, flags);
960960
}
961961

962-
static void via_sdc_tasklet_finish(unsigned long param)
962+
static void via_sdc_tasklet_finish(struct tasklet_struct *t)
963963
{
964-
struct via_crdr_mmc_host *host;
964+
struct via_crdr_mmc_host *host = from_tasklet(host, t, finish_tasklet);
965965
unsigned long flags;
966966
struct mmc_request *mrq;
967967

968-
host = (struct via_crdr_mmc_host *)param;
969-
970968
spin_lock_irqsave(&host->lock, flags);
971969

972970
del_timer(&host->timer);
@@ -1050,8 +1048,7 @@ static void via_init_mmc_host(struct via_crdr_mmc_host *host)
10501048

10511049
INIT_WORK(&host->carddet_work, via_sdc_card_detect);
10521050

1053-
tasklet_init(&host->finish_tasklet, via_sdc_tasklet_finish,
1054-
(unsigned long)host);
1051+
tasklet_setup(&host->finish_tasklet, via_sdc_tasklet_finish);
10551052

10561053
addrbase = host->sdhc_mmiobase;
10571054
writel(0x0, addrbase + VIA_CRDR_SDINTMASK);

0 commit comments

Comments
 (0)