[PATCH v4 06/16] crypto: caam - use devres to allocate 'inpring'

[Andrey Smirnov]

Use devres to allocate 'inpring' and drop corresponding
dma_free_coherent() call as well explicit references to size of
'inpring' elemet (needet in following commits). No functional change
intended.

Signed-off-by: Andrey Smirnov <andrew.smir...@gmail.com>
Cc: Chris Spencer <christopher.spen...@sea.co.uk>
Cc: Cory Tusar <cory.tu...@zii.aero>
Cc: Chris Healy <cphe...@gmail.com>
Cc: Lucas Stach <l.st...@pengutronix.de>
Cc: Horia Geantă <horia.gea...@nxp.com>
Cc: Aymen Sghaier <aymen.sgha...@nxp.com>
Cc: Leonard Crestez <leonard.cres...@nxp.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-ker...@vger.kernel.org
---
 drivers/crypto/caam/jr.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index 1eaa91dcc146..813e9135babd 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -108,7 +108,6 @@ static int caam_reset_hw_jr(struct device *dev)
 static int caam_jr_shutdown(struct device *dev)
 {
        struct caam_drv_private_jr *jrp = dev_get_drvdata(dev);
-       dma_addr_t inpbusaddr;
        int ret;
 
        ret = caam_reset_hw_jr(dev);
@@ -118,11 +117,6 @@ static int caam_jr_shutdown(struct device *dev)
        /* Release interrupt */
        free_irq(jrp->irq, dev);
 
-       /* Free rings */
-       inpbusaddr = rd_reg64(&jrp->rregs->inpring_base);
-       dma_free_coherent(dev, sizeof(dma_addr_t) * JOBR_DEPTH,
-                         jrp->inpring, inpbusaddr);
-
        return ret;
 }
 
@@ -451,8 +445,9 @@ static int caam_jr_init(struct device *dev)
                goto out_free_irq;
 
        error = -ENOMEM;
-       jrp->inpring = dma_alloc_coherent(dev, sizeof(*jrp->inpring) *
-                                         JOBR_DEPTH, &inpbusaddr, GFP_KERNEL);
+       jrp->inpring = dmam_alloc_coherent(dev, sizeof(*jrp->inpring) *
+                                          JOBR_DEPTH, &inpbusaddr,
+                                          GFP_KERNEL);
        if (!jrp->inpring)
                goto out_free_irq;
 
@@ -460,7 +455,7 @@ static int caam_jr_init(struct device *dev)
                                           JOBR_DEPTH, &outbusaddr,
                                           GFP_KERNEL);
        if (!jrp->outring)
-               goto out_free_inpring;
+               return -ENOMEM;
 
        jrp->entinfo = devm_kcalloc(dev, JOBR_DEPTH, sizeof(*jrp->entinfo),
                                    GFP_KERNEL);
@@ -493,10 +488,6 @@ static int caam_jr_init(struct device *dev)
 
        return 0;
 
-out_free_inpring:
-       dma_free_coherent(dev, sizeof(dma_addr_t) * JOBR_DEPTH,
-                         jrp->inpring, inpbusaddr);
-       dev_err(dev, "can't allocate job rings for %d\n", jrp->ridx);
 out_free_irq:
        free_irq(jrp->irq, dev);
        return error;
-- 
2.21.0