From: Allen Pais <allen.lkml@gmail.com>
To: nicolas.ferre@microchip.com, alexandre.belloni@bootlin.com,
ludovic.desroches@microchip.com, heiko@sntech.de,
matthias.bgg@gmail.com
Cc: keescook@chromium.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org,
inux-mediatek@lists.infradead.org,
Allen Pais <allen.lkml@gmail.com>,
Romain Perier <romain.perier@gmail.com>
Subject: [PATCH 02/19] crypto: atmel: convert tasklets to use new tasklet_setup() API
Date: Mon, 17 Aug 2020 13:39:24 +0530 [thread overview]
Message-ID: <20200817080941.19227-3-allen.lkml@gmail.com> (raw)
In-Reply-To: <20200817080941.19227-1-allen.lkml@gmail.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 <allen.lkml@gmail.com>
---
drivers/crypto/atmel-aes.c | 14 ++++++--------
drivers/crypto/atmel-sha.c | 14 ++++++--------
drivers/crypto/atmel-tdes.c | 14 ++++++--------
3 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c
index a6e14491e080..99851e40c729 100644
--- a/drivers/crypto/atmel-aes.c
+++ b/drivers/crypto/atmel-aes.c
@@ -2300,16 +2300,16 @@ static void atmel_aes_dma_cleanup(struct atmel_aes_dev *dd)
dma_release_channel(dd->src.chan);
}
-static void atmel_aes_queue_task(unsigned long data)
+static void atmel_aes_queue_task(struct tasklet_struct *t)
{
- struct atmel_aes_dev *dd = (struct atmel_aes_dev *)data;
+ struct atmel_aes_dev *dd = from_tasklet(dd, t, queue_task);
atmel_aes_handle_queue(dd, NULL);
}
-static void atmel_aes_done_task(unsigned long data)
+static void atmel_aes_done_task(struct tasklet_struct *t)
{
- struct atmel_aes_dev *dd = (struct atmel_aes_dev *)data;
+ struct atmel_aes_dev *dd = from_tasklet(dd, t, done_task);
dd->is_async = true;
(void)dd->resume(dd);
@@ -2499,10 +2499,8 @@ static int atmel_aes_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&aes_dd->list);
spin_lock_init(&aes_dd->lock);
- tasklet_init(&aes_dd->done_task, atmel_aes_done_task,
- (unsigned long)aes_dd);
- tasklet_init(&aes_dd->queue_task, atmel_aes_queue_task,
- (unsigned long)aes_dd);
+ tasklet_setup(&aes_dd->done_task, atmel_aes_done_task);
+ tasklet_setup(&aes_dd->queue_task, atmel_aes_queue_task);
crypto_init_queue(&aes_dd->queue, ATMEL_AES_QUEUE_LENGTH);
diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c
index 75ccf41a7cb9..84a7c8a9dd02 100644
--- a/drivers/crypto/atmel-sha.c
+++ b/drivers/crypto/atmel-sha.c
@@ -1314,9 +1314,9 @@ static struct ahash_alg sha_384_512_algs[] = {
},
};
-static void atmel_sha_queue_task(unsigned long data)
+static void atmel_sha_queue_task(struct tasklet_struct *t)
{
- struct atmel_sha_dev *dd = (struct atmel_sha_dev *)data;
+ struct atmel_sha_dev *dd = from_tasklet(dd, t, queue_task);
atmel_sha_handle_queue(dd, NULL);
}
@@ -1353,9 +1353,9 @@ static int atmel_sha_done(struct atmel_sha_dev *dd)
return err;
}
-static void atmel_sha_done_task(unsigned long data)
+static void atmel_sha_done_task(struct tasklet_struct *t)
{
- struct atmel_sha_dev *dd = (struct atmel_sha_dev *)data;
+ struct atmel_sha_dev *dd = from_tasklet(dd, t, done_task);
dd->is_async = true;
(void)dd->resume(dd);
@@ -2570,10 +2570,8 @@ static int atmel_sha_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&sha_dd->list);
spin_lock_init(&sha_dd->lock);
- tasklet_init(&sha_dd->done_task, atmel_sha_done_task,
- (unsigned long)sha_dd);
- tasklet_init(&sha_dd->queue_task, atmel_sha_queue_task,
- (unsigned long)sha_dd);
+ tasklet_setup(&sha_dd->done_task, atmel_sha_done_task);
+ tasklet_setup(&sha_dd->queue_task, atmel_sha_queue_task);
crypto_init_queue(&sha_dd->queue, ATMEL_SHA_QUEUE_LENGTH);
diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c
index ed40dbb98c6b..170809892acf 100644
--- a/drivers/crypto/atmel-tdes.c
+++ b/drivers/crypto/atmel-tdes.c
@@ -1049,16 +1049,16 @@ static struct skcipher_alg tdes_algs[] = {
},
};
-static void atmel_tdes_queue_task(unsigned long data)
+static void atmel_tdes_queue_task(struct tasklet_struct *t)
{
- struct atmel_tdes_dev *dd = (struct atmel_tdes_dev *)data;
+ struct atmel_tdes_dev *dd = from_tasklet(dd, t, queue_task);
atmel_tdes_handle_queue(dd, NULL);
}
-static void atmel_tdes_done_task(unsigned long data)
+static void atmel_tdes_done_task(struct tasklet_struct *t)
{
- struct atmel_tdes_dev *dd = (struct atmel_tdes_dev *) data;
+ struct atmel_tdes_dev *dd = from_tasklet(dd, t, done_task);
int err;
if (!(dd->flags & TDES_FLAGS_DMA))
@@ -1177,10 +1177,8 @@ static int atmel_tdes_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&tdes_dd->list);
spin_lock_init(&tdes_dd->lock);
- tasklet_init(&tdes_dd->done_task, atmel_tdes_done_task,
- (unsigned long)tdes_dd);
- tasklet_init(&tdes_dd->queue_task, atmel_tdes_queue_task,
- (unsigned long)tdes_dd);
+ tasklet_setup(&tdes_dd->done_task, atmel_tdes_done_task);
+ tasklet_setup(&tdes_dd->queue_task, atmel_tdes_queue_task);
crypto_init_queue(&tdes_dd->queue, ATMEL_TDES_QUEUE_LENGTH);
--
2.17.1
next prev parent reply other threads:[~2020-08-17 8:10 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-17 8:09 [PATCH 00/19] crypto: convert tasklets to use new tasklet_setup() Allen Pais
2020-08-17 8:09 ` [PATCH 01/19] crypto: amcc: convert tasklets to use new tasklet_setup() API Allen Pais
2020-08-17 8:09 ` Allen Pais [this message]
2020-08-17 8:09 ` [PATCH 03/19] crypto: axis: " Allen Pais
2020-08-17 8:09 ` [PATCH 04/19] crypto: caam: " Allen Pais
2020-08-17 12:28 ` kernel test robot
2020-08-17 8:09 ` [PATCH 05/19] crypto: cavium: " Allen Pais
2020-08-17 8:09 ` [PATCH 06/19] crypto: ccp: " Allen Pais
2020-08-17 8:09 ` [PATCH 07/19] crypto: ccree: " Allen Pais
2020-08-17 8:09 ` [PATCH 08/19] crypto: hifn_795x: " Allen Pais
2020-08-17 8:09 ` [PATCH 09/19] crypto: img-hash: " Allen Pais
2020-08-17 8:09 ` [PATCH 10/19] crypto: ixp4xx: " Allen Pais
2020-08-17 8:09 ` [PATCH 11/19] crypto: mediatek: " Allen Pais
2020-08-17 8:09 ` [PATCH 12/19] crypto: omap: " Allen Pais
2020-08-17 8:09 ` [PATCH 13/19] crypto: picoxcell: " Allen Pais
2020-08-17 8:09 ` [PATCH 14/19] crypto: qat: " Allen Pais
2020-08-17 8:09 ` [PATCH 15/19] crypto: qce: " Allen Pais
2020-08-17 8:09 ` [PATCH 16/19] crypto: rockchip: " Allen Pais
2020-08-17 8:09 ` [PATCH 17/19] crypto: s5p: " Allen Pais
2020-08-17 8:09 ` [PATCH 18/19] crypto: talitos: " Allen Pais
2020-08-17 12:33 ` kernel test robot
2020-08-17 8:09 ` [PATCH 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=20200817080941.19227-3-allen.lkml@gmail.com \
--to=allen.lkml@gmail.com \
--cc=alexandre.belloni@bootlin.com \
--cc=heiko@sntech.de \
--cc=inux-mediatek@lists.infradead.org \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=ludovic.desroches@microchip.com \
--cc=matthias.bgg@gmail.com \
--cc=nicolas.ferre@microchip.com \
--cc=romain.perier@gmail.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).