Use devres to allocate 'outring' and drop corresponding call to dma_free_coherent() as well as extra references to 'struct jr_outentry' (needed in following commits). No functional change inteded.
Signed-off-by: Andrey Smirnov <[email protected]> Cc: Chris Spencer <[email protected]> Cc: Cory Tusar <[email protected]> Cc: Chris Healy <[email protected]> Cc: Lucas Stach <[email protected]> Cc: Horia Geantă <[email protected]> Cc: Aymen Sghaier <[email protected]> Cc: Leonard Crestez <[email protected]> Cc: [email protected] Cc: [email protected] --- drivers/crypto/caam/jr.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c index fc7deb445aa8..1eaa91dcc146 100644 --- a/drivers/crypto/caam/jr.c +++ b/drivers/crypto/caam/jr.c @@ -108,7 +108,7 @@ 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, outbusaddr; + dma_addr_t inpbusaddr; int ret; ret = caam_reset_hw_jr(dev); @@ -120,11 +120,8 @@ static int caam_jr_shutdown(struct device *dev) /* Free rings */ inpbusaddr = rd_reg64(&jrp->rregs->inpring_base); - outbusaddr = rd_reg64(&jrp->rregs->outring_base); dma_free_coherent(dev, sizeof(dma_addr_t) * JOBR_DEPTH, jrp->inpring, inpbusaddr); - dma_free_coherent(dev, sizeof(struct jr_outentry) * JOBR_DEPTH, - jrp->outring, outbusaddr); return ret; } @@ -459,15 +456,16 @@ static int caam_jr_init(struct device *dev) if (!jrp->inpring) goto out_free_irq; - jrp->outring = dma_alloc_coherent(dev, sizeof(*jrp->outring) * - JOBR_DEPTH, &outbusaddr, GFP_KERNEL); + jrp->outring = dmam_alloc_coherent(dev, sizeof(*jrp->outring) * + JOBR_DEPTH, &outbusaddr, + GFP_KERNEL); if (!jrp->outring) goto out_free_inpring; jrp->entinfo = devm_kcalloc(dev, JOBR_DEPTH, sizeof(*jrp->entinfo), GFP_KERNEL); if (!jrp->entinfo) - goto out_free_outring; + return -ENOMEM; tasklet_init(&jrp->irqtask, caam_jr_dequeue, (unsigned long)dev); @@ -495,9 +493,6 @@ static int caam_jr_init(struct device *dev) return 0; -out_free_outring: - dma_free_coherent(dev, sizeof(struct jr_outentry) * JOBR_DEPTH, - jrp->outring, outbusaddr); out_free_inpring: dma_free_coherent(dev, sizeof(dma_addr_t) * JOBR_DEPTH, jrp->inpring, inpbusaddr); -- 2.21.0
