Commit 0c1a3e8b authored by Emil Renner Berthing's avatar Emil Renner Berthing Committed by Ulf Hansson
Browse files

mmc: wbsd: Use new tasklet API 



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

Signed-off-by: default avatarEmil Renner Berthing <kernel@esmil.dk>
Link: https://lore.kernel.org/r/20210204151847.91353-10-kernel@esmil.dk


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent e821afd8

drivers/mmc/host/wbsd.c

+15 −20
Original line number Diff line number Diff line
@@ -987,9 +987,9 @@ static inline struct mmc_data *wbsd_get_data(struct wbsd_host *host) 
	return host->mrq->cmd->data;

}



static void wbsd_tasklet_card(unsigned long param)

static void wbsd_tasklet_card(struct tasklet_struct *t)

{

	struct wbsd_host *host = (struct wbsd_host *)param;

	struct wbsd_host *host = from_tasklet(host, t, card_tasklet);

	u8 csr;

	int delay = -1;
@@ -1036,9 +1036,9 @@ static void wbsd_tasklet_card(unsigned long param) 
		mmc_detect_change(host->mmc, msecs_to_jiffies(delay));

}



static void wbsd_tasklet_fifo(unsigned long param)

static void wbsd_tasklet_fifo(struct tasklet_struct *t)

{

	struct wbsd_host *host = (struct wbsd_host *)param;

	struct wbsd_host *host = from_tasklet(host, t, fifo_tasklet);

	struct mmc_data *data;



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

}



static void wbsd_tasklet_crc(unsigned long param)

static void wbsd_tasklet_crc(struct tasklet_struct *t)

{

	struct wbsd_host *host = (struct wbsd_host *)param;

	struct wbsd_host *host = from_tasklet(host, t, crc_tasklet);

	struct mmc_data *data;



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

}



static void wbsd_tasklet_timeout(unsigned long param)

static void wbsd_tasklet_timeout(struct tasklet_struct *t)

{

	struct wbsd_host *host = (struct wbsd_host *)param;

	struct wbsd_host *host = from_tasklet(host, t, timeout_tasklet);

	struct mmc_data *data;



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

}



static void wbsd_tasklet_finish(unsigned long param)

static void wbsd_tasklet_finish(struct tasklet_struct *t)

{

	struct wbsd_host *host = (struct wbsd_host *)param;

	struct wbsd_host *host = from_tasklet(host, t, finish_tasklet);

	struct mmc_data *data;



	spin_lock(&host->lock);
@@ -1449,16 +1449,11 @@ static int wbsd_request_irq(struct wbsd_host *host, int irq) 
	/*

	 * Set up tasklets. Must be done before requesting interrupt.

	 */

	tasklet_init(&host->card_tasklet, wbsd_tasklet_card,

			(unsigned long)host);

	tasklet_init(&host->fifo_tasklet, wbsd_tasklet_fifo,

			(unsigned long)host);

	tasklet_init(&host->crc_tasklet, wbsd_tasklet_crc,

			(unsigned long)host);

	tasklet_init(&host->timeout_tasklet, wbsd_tasklet_timeout,

			(unsigned long)host);

	tasklet_init(&host->finish_tasklet, wbsd_tasklet_finish,

			(unsigned long)host);

	tasklet_setup(&host->card_tasklet, wbsd_tasklet_card);

	tasklet_setup(&host->fifo_tasklet, wbsd_tasklet_fifo);

	tasklet_setup(&host->crc_tasklet, wbsd_tasklet_crc);

	tasklet_setup(&host->timeout_tasklet, wbsd_tasklet_timeout);

	tasklet_setup(&host->finish_tasklet, wbsd_tasklet_finish);



	/*

	 * Allocate interrupt.