From: Joel Fernandes Date: Sun, 18 Aug 2013 02:42:34 +0000 (-0500) Subject: crypto: omap-aes - Convert request_irq to devm_request_irq X-Git-Tag: upstream/snapshot3+hdmi~4398^2~22 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bce2a22885e657099d9f2cf82269bb4629ba744d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git crypto: omap-aes - Convert request_irq to devm_request_irq Keeps request_irq exit/error code paths simpler. Suggested-by: Lokesh Vutla Signed-off-by: Joel Fernandes Signed-off-by: Herbert Xu --- diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c index 1f3d816..ce791c2 100644 --- a/drivers/crypto/omap-aes.c +++ b/drivers/crypto/omap-aes.c @@ -1207,7 +1207,7 @@ static int omap_aes_probe(struct platform_device *pdev) goto err_irq; } - err = request_irq(irq, omap_aes_irq, 0, + err = devm_request_irq(dev, irq, omap_aes_irq, 0, dev_name(dev), dd); if (err) { dev_err(dev, "Unable to grab omap-aes IRQ\n"); @@ -1242,9 +1242,7 @@ err_algs: for (j = dd->pdata->algs_info[i].registered - 1; j >= 0; j--) crypto_unregister_alg( &dd->pdata->algs_info[i].algs_list[j]); - if (dd->pio_only) - free_irq(irq, dd); - else + if (!dd->pio_only) omap_aes_dma_cleanup(dd); err_irq: tasklet_kill(&dd->done_task);