Skip to content

Commit 0c1a3e8

Browse files
esmilstorulf
authored andcommitted
mmc: wbsd: 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 e821afd commit 0c1a3e8

File tree

1 file changed

+15
-20
lines changed

1 file changed

+15
-20
lines changed

drivers/mmc/host/wbsd.c

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -987,9 +987,9 @@ static inline struct mmc_data *wbsd_get_data(struct wbsd_host *host)
987987
return host->mrq->cmd->data;
988988
}
989989

990-
static void wbsd_tasklet_card(unsigned long param)
990+
static void wbsd_tasklet_card(struct tasklet_struct *t)
991991
{
992-
struct wbsd_host *host = (struct wbsd_host *)param;
992+
struct wbsd_host *host = from_tasklet(host, t, card_tasklet);
993993
u8 csr;
994994
int delay = -1;
995995

@@ -1036,9 +1036,9 @@ static void wbsd_tasklet_card(unsigned long param)
10361036
mmc_detect_change(host->mmc, msecs_to_jiffies(delay));
10371037
}
10381038

1039-
static void wbsd_tasklet_fifo(unsigned long param)
1039+
static void wbsd_tasklet_fifo(struct tasklet_struct *t)
10401040
{
1041-
struct wbsd_host *host = (struct wbsd_host *)param;
1041+
struct wbsd_host *host = from_tasklet(host, t, fifo_tasklet);
10421042
struct mmc_data *data;
10431043

10441044
spin_lock(&host->lock);
@@ -1067,9 +1067,9 @@ static void wbsd_tasklet_fifo(unsigned long param)
10671067
spin_unlock(&host->lock);
10681068
}
10691069

1070-
static void wbsd_tasklet_crc(unsigned long param)
1070+
static void wbsd_tasklet_crc(struct tasklet_struct *t)
10711071
{
1072-
struct wbsd_host *host = (struct wbsd_host *)param;
1072+
struct wbsd_host *host = from_tasklet(host, t, crc_tasklet);
10731073
struct mmc_data *data;
10741074

10751075
spin_lock(&host->lock);
@@ -1091,9 +1091,9 @@ static void wbsd_tasklet_crc(unsigned long param)
10911091
spin_unlock(&host->lock);
10921092
}
10931093

1094-
static void wbsd_tasklet_timeout(unsigned long param)
1094+
static void wbsd_tasklet_timeout(struct tasklet_struct *t)
10951095
{
1096-
struct wbsd_host *host = (struct wbsd_host *)param;
1096+
struct wbsd_host *host = from_tasklet(host, t, timeout_tasklet);
10971097
struct mmc_data *data;
10981098

10991099
spin_lock(&host->lock);
@@ -1115,9 +1115,9 @@ static void wbsd_tasklet_timeout(unsigned long param)
11151115
spin_unlock(&host->lock);
11161116
}
11171117

1118-
static void wbsd_tasklet_finish(unsigned long param)
1118+
static void wbsd_tasklet_finish(struct tasklet_struct *t)
11191119
{
1120-
struct wbsd_host *host = (struct wbsd_host *)param;
1120+
struct wbsd_host *host = from_tasklet(host, t, finish_tasklet);
11211121
struct mmc_data *data;
11221122

11231123
spin_lock(&host->lock);
@@ -1449,16 +1449,11 @@ static int wbsd_request_irq(struct wbsd_host *host, int irq)
14491449
/*
14501450
* Set up tasklets. Must be done before requesting interrupt.
14511451
*/
1452-
tasklet_init(&host->card_tasklet, wbsd_tasklet_card,
1453-
(unsigned long)host);
1454-
tasklet_init(&host->fifo_tasklet, wbsd_tasklet_fifo,
1455-
(unsigned long)host);
1456-
tasklet_init(&host->crc_tasklet, wbsd_tasklet_crc,
1457-
(unsigned long)host);
1458-
tasklet_init(&host->timeout_tasklet, wbsd_tasklet_timeout,
1459-
(unsigned long)host);
1460-
tasklet_init(&host->finish_tasklet, wbsd_tasklet_finish,
1461-
(unsigned long)host);
1452+
tasklet_setup(&host->card_tasklet, wbsd_tasklet_card);
1453+
tasklet_setup(&host->fifo_tasklet, wbsd_tasklet_fifo);
1454+
tasklet_setup(&host->crc_tasklet, wbsd_tasklet_crc);
1455+
tasklet_setup(&host->timeout_tasklet, wbsd_tasklet_timeout);
1456+
tasklet_setup(&host->finish_tasklet, wbsd_tasklet_finish);
14621457

14631458
/*
14641459
* Allocate interrupt.

0 commit comments

Comments
 (0)