summaryrefslogtreecommitdiff
path: root/drivers/crypto
diff options
context:
space:
mode:
authorJoel Fernandes <joelf@ti.com>2013-08-18 06:42:34 +0400
committerHerbert Xu <herbert@gondor.apana.org.au>2013-08-21 15:28:05 +0400
commitbce2a22885e657099d9f2cf82269bb4629ba744d (patch)
tree8c324b12d91aebdd09750f0d5e92618e39fe6d69 /drivers/crypto
parent05007c10ff76a9d6d85c007fe3a7f531611fda5c (diff)
downloadlinux-bce2a22885e657099d9f2cf82269bb4629ba744d.tar.xz
crypto: omap-aes - Convert request_irq to devm_request_irq
Keeps request_irq exit/error code paths simpler. Suggested-by: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Joel Fernandes <joelf@ti.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/omap-aes.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index 1f3d816cc9e6..ce791c2f81f7 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);