From: Emil Renner Berthing <kernel@esmil.dk>
To: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org
Cc: Emil Renner Berthing <kernel@esmil.dk>,
Ludovic Desroches <ludovic.desroches@microchip.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Manuel Lauss <manuel.lauss@gmail.com>,
Jaehoon Chung <jh80.chung@samsung.com>,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Ben Dooks <ben-linux@fluff.org>, Alex Dubov <oakad@yahoo.com>,
Bruce Chang <brucechang@via.com.tw>,
Harald Welte <HaraldWelte@viatech.com>,
Pierre Ossman <pierre@ossman.eu>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 9/9] mmc: wbsd: Use new tasklet API
Date: Thu, 4 Feb 2021 16:18:47 +0100 [thread overview]
Message-ID: <20210204151847.91353-10-kernel@esmil.dk> (raw)
In-Reply-To: <20210204151847.91353-1-kernel@esmil.dk>
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>
---
drivers/mmc/host/wbsd.c | 35 +++++++++++++++--------------------
1 file changed, 15 insertions(+), 20 deletions(-)
diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index cd63ea865b77..67ecd342fe5f 100644
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -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.
--
2.30.0
next prev parent reply other threads:[~2021-02-04 15:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-04 15:18 [PATCH 0/9] drivers: mmc: Update trivial tasklet_init() callers Emil Renner Berthing
2021-02-04 15:18 ` [PATCH 1/9] mmc: atmel-mci: Use new tasklet API Emil Renner Berthing
2021-02-04 15:18 ` [PATCH 2/9] mmc: au1xmmc: " Emil Renner Berthing
2021-02-04 15:18 ` [PATCH 3/9] mmc: dw_mmc: " Emil Renner Berthing
2021-02-04 15:18 ` [PATCH 4/9] mmc: omap: " Emil Renner Berthing
2021-02-04 15:18 ` [PATCH 5/9] mmc: s3cmci: " Emil Renner Berthing
2021-02-04 15:18 ` [PATCH 6/9] mmc: tifm_sd: " Emil Renner Berthing
2021-02-04 15:18 ` [PATCH 7/9] mmc: uniphier-sd: " Emil Renner Berthing
2021-02-04 15:18 ` [PATCH 8/9] mmc: via-sdmmc: " Emil Renner Berthing
2021-02-04 15:18 ` Emil Renner Berthing [this message]
2021-02-08 12:07 ` [PATCH 0/9] drivers: mmc: Update trivial tasklet_init() callers Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210204151847.91353-10-kernel@esmil.dk \
--to=kernel@esmil.dk \
--cc=HaraldWelte@viatech.com \
--cc=aaro.koskinen@iki.fi \
--cc=alexandre.belloni@bootlin.com \
--cc=ben-linux@fluff.org \
--cc=brucechang@via.com.tw \
--cc=jh80.chung@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=manuel.lauss@gmail.com \
--cc=nicolas.ferre@microchip.com \
--cc=oakad@yahoo.com \
--cc=pierre@ossman.eu \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).