[RESEND 12/19] crypto: omap: convert tasklets to use new tasklet_setup() API

[Allen Pais]

From: Allen Pais <ap...@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.per...@gmail.com>
Signed-off-by: Allen Pais <ap...@microsoft.com>
---
 drivers/crypto/omap-aes.c  | 6 +++---
 drivers/crypto/omap-des.c  | 6 +++---
 drivers/crypto/omap-sham.c | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index 4fd14d90cc40..4eae24167a5d 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -502,9 +502,9 @@ static void omap_aes_copy_ivout(struct omap_aes_dev *dd, u8 
*ivbuf)
                ((u32 *)ivbuf)[i] = omap_aes_read(dd, AES_REG_IV(dd, i));
 }
 
-static void omap_aes_done_task(unsigned long data)
+static void omap_aes_done_task(struct tasklet_struct *t)
 {
-       struct omap_aes_dev *dd = (struct omap_aes_dev *)data;
+       struct omap_aes_dev *dd = from_tasklet(dd, t, done_task);
 
        pr_debug("enter done_task\n");
 
@@ -1150,7 +1150,7 @@ static int omap_aes_probe(struct platform_device *pdev)
                 (reg & dd->pdata->major_mask) >> dd->pdata->major_shift,
                 (reg & dd->pdata->minor_mask) >> dd->pdata->minor_shift);
 
-       tasklet_init(&dd->done_task, omap_aes_done_task, (unsigned long)dd);
+       tasklet_setup(&dd->done_task, omap_aes_done_task);
 
        err = omap_aes_dma_init(dd);
        if (err == -EPROBE_DEFER) {
diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index c9d38bcfd1c7..fddcfc3ba57b 100644
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -594,9 +594,9 @@ static int omap_des_crypt_req(struct crypto_engine *engine,
        return omap_des_crypt_dma_start(dd);
 }
 
-static void omap_des_done_task(unsigned long data)
+static void omap_des_done_task(struct tasklet_struct *t)
 {
-       struct omap_des_dev *dd = (struct omap_des_dev *)data;
+       struct omap_des_dev *dd = from_tasklet(dd, t, done_task);
        int i;
 
        pr_debug("enter done_task\n");
@@ -1011,7 +1011,7 @@ static int omap_des_probe(struct platform_device *pdev)
                 (reg & dd->pdata->major_mask) >> dd->pdata->major_shift,
                 (reg & dd->pdata->minor_mask) >> dd->pdata->minor_shift);
 
-       tasklet_init(&dd->done_task, omap_des_done_task, (unsigned long)dd);
+       tasklet_setup(&dd->done_task, omap_des_done_task);
 
        err = omap_des_dma_init(dd);
        if (err == -EPROBE_DEFER) {
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c
index a3b38d2c92e7..b0fa0443793b 100644
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@ -1724,9 +1724,9 @@ static struct ahash_alg algs_sha384_sha512[] = {
 },
 };
 
-static void omap_sham_done_task(unsigned long data)
+static void omap_sham_done_task(struct tasklet_struct *t)
 {
-       struct omap_sham_dev *dd = (struct omap_sham_dev *)data;
+       struct omap_sham_dev *dd = from_tasklet(dd, t, done_task);
        int err = 0;
 
        dev_dbg(dd->dev, "%s: flags=%lx\n", __func__, dd->flags);
@@ -2083,7 +2083,7 @@ static int omap_sham_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, dd);
 
        INIT_LIST_HEAD(&dd->list);
-       tasklet_init(&dd->done_task, omap_sham_done_task, (unsigned long)dd);
+       tasklet_setup(&dd->done_task, omap_sham_done_task);
        crypto_init_queue(&dd->queue, OMAP_SHAM_QUEUE_LENGTH);
 
        err = (dev->of_node) ? omap_sham_get_res_of(dd, dev, &res) :
-- 
2.25.1