From: Allen Pais <allen.lkml@gmail.com>
To: herbert@gondor.apana.org.au
Cc: davem@davemloft.net, nicolas.ferre@microchip.com,
alexandre.belloni@bootlin.com, ludovic.desroches@microchip.com,
jesper.nilsson@axis.com, lars.persson@axis.com,
horia.geanta@nxp.com, aymen.sghaier@nxp.com,
gcherian@marvell.com, thomas.lendacky@amd.com,
john.allen@amd.com, gilad@benyossef.com, bbrezillon@kernel.org,
arno@natisbad.org, schalla@marvell.com, matthias.bgg@gmail.com,
jamie@jamieiles.com, giovanni.cabiddu@intel.com, heiko@sntech.de,
krzk@kernel.org, vz@mleia.com, k.konieczny@samsung.com,
linux-crypto@vger.kernel.org, linux-mediatek@lists.infradead.org,
qat-linux@intel.com, linux-rockchip@lists.infradead.org,
linux-samsung-soc@vger.kernel.org,
Allen Pais <apais@linux.microsoft.com>,
Romain Perier <romain.perier@gmail.com>
Subject: [PATCH v3 18/19] crypto: talitos: convert tasklets to use new tasklet_setup() API
Date: Tue, 12 Jan 2021 07:16:49 +0530 [thread overview]
Message-ID: <20210112014650.10887-19-allen.lkml@gmail.com> (raw)
In-Reply-To: <20210112014650.10887-1-allen.lkml@gmail.com>
From: Allen Pais <apais@linux.microsoft.com>
In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.
Signed-off-by: Romain Perier <romain.perier@gmail.com>
Signed-off-by: Allen Pais <apais@linux.microsoft.com>
---
drivers/crypto/talitos.c | 42 ++++++++++++++++++----------------------
1 file changed, 19 insertions(+), 23 deletions(-)
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index 4fd85f31630a..be4f7dd810fd 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -403,10 +403,11 @@ static void flush_channel(struct device *dev, int ch, int error, int reset_ch)
* process completed requests for channels that have done status
*/
#define DEF_TALITOS1_DONE(name, ch_done_mask) \
-static void talitos1_done_##name(unsigned long data) \
+static void talitos1_done_##name(struct tasklet_struct *t) \
{ \
- struct device *dev = (struct device *)data; \
- struct talitos_private *priv = dev_get_drvdata(dev); \
+ struct talitos_private *priv = from_tasklet(priv, t, \
+ done_task[0]); \
+ struct device *dev = priv->dev; \
unsigned long flags; \
\
if (ch_done_mask & 0x10000000) \
@@ -429,11 +430,12 @@ static void talitos1_done_##name(unsigned long data) \
DEF_TALITOS1_DONE(4ch, TALITOS1_ISR_4CHDONE)
DEF_TALITOS1_DONE(ch0, TALITOS1_ISR_CH_0_DONE)
-#define DEF_TALITOS2_DONE(name, ch_done_mask) \
-static void talitos2_done_##name(unsigned long data) \
+#define DEF_TALITOS2_DONE(name, ch_done_mask, tasklet_idx) \
+static void talitos2_done_##name(struct tasklet_struct *t) \
{ \
- struct device *dev = (struct device *)data; \
- struct talitos_private *priv = dev_get_drvdata(dev); \
+ struct talitos_private *priv = from_tasklet(priv, t, \
+ done_task[tasklet_idx]); \
+ struct device *dev = priv->dev; \
unsigned long flags; \
\
if (ch_done_mask & 1) \
@@ -453,10 +455,10 @@ static void talitos2_done_##name(unsigned long data) \
spin_unlock_irqrestore(&priv->reg_lock, flags); \
}
-DEF_TALITOS2_DONE(4ch, TALITOS2_ISR_4CHDONE)
-DEF_TALITOS2_DONE(ch0, TALITOS2_ISR_CH_0_DONE)
-DEF_TALITOS2_DONE(ch0_2, TALITOS2_ISR_CH_0_2_DONE)
-DEF_TALITOS2_DONE(ch1_3, TALITOS2_ISR_CH_1_3_DONE)
+DEF_TALITOS2_DONE(4ch, TALITOS2_ISR_4CHDONE, 0)
+DEF_TALITOS2_DONE(ch0, TALITOS2_ISR_CH_0_DONE, 0)
+DEF_TALITOS2_DONE(ch0_2, TALITOS2_ISR_CH_0_2_DONE, 0)
+DEF_TALITOS2_DONE(ch1_3, TALITOS2_ISR_CH_1_3_DONE, 1)
/*
* locate current (offending) descriptor
@@ -3386,23 +3388,17 @@ static int talitos_probe(struct platform_device *ofdev)
if (has_ftr_sec1(priv)) {
if (priv->num_channels == 1)
- tasklet_init(&priv->done_task[0], talitos1_done_ch0,
- (unsigned long)dev);
+ tasklet_setup(&priv->done_task[0], talitos1_done_ch0);
else
- tasklet_init(&priv->done_task[0], talitos1_done_4ch,
- (unsigned long)dev);
+ tasklet_setup(&priv->done_task[0], talitos1_done_4ch);
} else {
if (priv->irq[1]) {
- tasklet_init(&priv->done_task[0], talitos2_done_ch0_2,
- (unsigned long)dev);
- tasklet_init(&priv->done_task[1], talitos2_done_ch1_3,
- (unsigned long)dev);
+ tasklet_setup(&priv->done_task[0], talitos2_done_ch0_2);
+ tasklet_setup(&priv->done_task[1], talitos2_done_ch1_3);
} else if (priv->num_channels == 1) {
- tasklet_init(&priv->done_task[0], talitos2_done_ch0,
- (unsigned long)dev);
+ tasklet_setup(&priv->done_task[0], talitos2_done_ch0);
} else {
- tasklet_init(&priv->done_task[0], talitos2_done_4ch,
- (unsigned long)dev);
+ tasklet_setup(&priv->done_task[0], talitos2_done_4ch);
}
}
--
2.25.1
next prev parent reply other threads:[~2021-01-12 1:50 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 1:46 [PATCH v3 00/19]crypto: convert tasklets to use new tasklet_setup API() Allen Pais
2021-01-12 1:46 ` [PATCH v3 01/19] crypto: amcc: convert tasklets to use new tasklet_setup() API Allen Pais
2021-01-12 1:46 ` [PATCH v3 02/19] crypto: atmel: " Allen Pais
2021-01-12 1:46 ` [PATCH v3 03/19] crypto: axis: " Allen Pais
2021-01-12 1:46 ` [PATCH v3 04/19] crypto: caam: " Allen Pais
2021-01-12 1:46 ` [PATCH v3 05/19] crypto: cavium: " Allen Pais
2021-01-12 1:46 ` [PATCH v3 06/19] crypto: ccp: " Allen Pais
2021-01-13 16:17 ` John Allen
2021-01-12 1:46 ` [PATCH v3 07/19] crypto: ccree: " Allen Pais
2021-01-12 1:46 ` [PATCH v3 08/19] crypto: hifn_795x: " Allen Pais
2021-01-12 1:46 ` [PATCH v3 09/19] crypto: img-hash: " Allen Pais
2021-01-12 1:46 ` [PATCH v3 10/19] crypto: ixp4xx: " Allen Pais
2021-01-12 1:46 ` [PATCH v3 11/19] crypto: mediatek: " Allen Pais
2021-01-12 1:46 ` [PATCH v3 12/19] crypto: omap: " Allen Pais
2021-01-12 1:46 ` [PATCH v3 13/19] crypto: picoxcell: " Allen Pais
2021-01-12 1:46 ` [PATCH v3 14/19] crypto: qat: " Allen Pais
2021-01-14 17:51 ` Giovanni Cabiddu
2021-01-18 7:11 ` Allen Pais
2021-01-12 1:46 ` [PATCH v3 15/19] crypto: qce: " Allen Pais
2021-01-12 1:46 ` [PATCH v3 16/19] crypto: rockchip: " Allen Pais
2021-01-12 1:46 ` [PATCH v3 17/19] crypto: s5p: " Allen Pais
2021-01-12 1:46 ` Allen Pais [this message]
2021-01-12 1:46 ` [PATCH v3 19/19] crypto: octeontx: " Allen Pais
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=20210112014650.10887-19-allen.lkml@gmail.com \
--to=allen.lkml@gmail.com \
--cc=alexandre.belloni@bootlin.com \
--cc=apais@linux.microsoft.com \
--cc=arno@natisbad.org \
--cc=aymen.sghaier@nxp.com \
--cc=bbrezillon@kernel.org \
--cc=davem@davemloft.net \
--cc=gcherian@marvell.com \
--cc=gilad@benyossef.com \
--cc=giovanni.cabiddu@intel.com \
--cc=heiko@sntech.de \
--cc=herbert@gondor.apana.org.au \
--cc=horia.geanta@nxp.com \
--cc=jamie@jamieiles.com \
--cc=jesper.nilsson@axis.com \
--cc=john.allen@amd.com \
--cc=k.konieczny@samsung.com \
--cc=krzk@kernel.org \
--cc=lars.persson@axis.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=matthias.bgg@gmail.com \
--cc=nicolas.ferre@microchip.com \
--cc=qat-linux@intel.com \
--cc=romain.perier@gmail.com \
--cc=schalla@marvell.com \
--cc=thomas.lendacky@amd.com \
--cc=vz@mleia.com \
/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).