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,
bbrezillon@kernel.org, arno@natisbad.org, schalla@marvell.com,
matthias.bgg@gmail.com, heiko@sntech.de, krzk@kernel.org,
vz@mleia.com, k.konieczny@samsung.com,
linux-crypto@vger.kernel.org, Allen Pais <apais@microsoft.com>,
Romain Perier <romain.perier@gmail.com>
Subject: [RESEND 18/19] crypto: talitos: convert tasklets to use new tasklet_setup() API
Date: Mon, 7 Dec 2020 14:29:30 +0530 [thread overview]
Message-ID: <20201207085931.661267-19-allen.lkml@gmail.com> (raw)
In-Reply-To: <20201207085931.661267-1-allen.lkml@gmail.com>
From: Allen Pais <apais@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@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 66773892f665..7cc985ce0766 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -402,10 +402,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) \
@@ -428,11 +429,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) \
@@ -452,10 +454,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
@@ -3385,23 +3387,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:[~2020-12-07 9:02 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-07 8:59 [RESEND 00/19] crypto: convert tasklets to use new tasklet_setup API() Allen Pais
2020-12-07 8:59 ` [RESEND 01/19] crypto: amcc: convert tasklets to use new tasklet_setup() API Allen Pais
2020-12-07 8:59 ` [RESEND 02/19] crypto: atmel: " Allen Pais
2020-12-07 8:59 ` [RESEND 03/19] crypto: axis: " Allen Pais
2020-12-07 8:59 ` [RESEND 04/19] crypto: caam: " Allen Pais
2020-12-14 17:21 ` Horia Geantă
2020-12-07 8:59 ` [RESEND 05/19] crypto: cavium: " Allen Pais
2020-12-07 8:59 ` [RESEND 06/19] crypto: ccp: " Allen Pais
2020-12-07 8:59 ` [RESEND 07/19] crypto: ccree: " Allen Pais
2020-12-07 18:23 ` kernel test robot
2020-12-09 6:46 ` Gilad Ben-Yossef
2020-12-09 11:35 ` Allen
2020-12-07 8:59 ` [RESEND 08/19] crypto: hifn_795x: " Allen Pais
2020-12-07 8:59 ` [RESEND 09/19] crypto: img-hash: " Allen Pais
2020-12-07 8:59 ` [RESEND 10/19] crypto: ixp4xx: " Allen Pais
2020-12-07 8:59 ` [RESEND 11/19] crypto: mediatek: " Allen Pais
2020-12-07 8:59 ` [RESEND 12/19] crypto: omap: " Allen Pais
2020-12-07 8:59 ` [RESEND 13/19] crypto: picoxcell: " Allen Pais
2020-12-07 8:59 ` [RESEND 14/19] crypto: qat: " Allen Pais
2020-12-07 8:59 ` [RESEND 15/19] crypto: qce: " Allen Pais
2020-12-07 8:59 ` [RESEND 16/19] crypto: rockchip: " Allen Pais
2020-12-07 8:59 ` [RESEND 17/19] crypto: s5p: " Allen Pais
2020-12-07 9:50 ` Krzysztof Kozlowski
2020-12-07 8:59 ` Allen Pais [this message]
2020-12-07 8:59 ` [RESEND 19/19] crypto: octeontx: " Allen Pais
2020-12-07 9:13 ` [RESEND 00/19] crypto: convert tasklets to use new tasklet_setup API() Krzysztof Kozlowski
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=20201207085931.661267-19-allen.lkml@gmail.com \
--to=allen.lkml@gmail.com \
--cc=alexandre.belloni@bootlin.com \
--cc=apais@microsoft.com \
--cc=arno@natisbad.org \
--cc=aymen.sghaier@nxp.com \
--cc=bbrezillon@kernel.org \
--cc=davem@davemloft.net \
--cc=heiko@sntech.de \
--cc=herbert@gondor.apana.org.au \
--cc=horia.geanta@nxp.com \
--cc=jesper.nilsson@axis.com \
--cc=k.konieczny@samsung.com \
--cc=krzk@kernel.org \
--cc=lars.persson@axis.com \
--cc=linux-crypto@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=matthias.bgg@gmail.com \
--cc=nicolas.ferre@microchip.com \
--cc=romain.perier@gmail.com \
--cc=schalla@marvell.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.