diff options
author | Joel Fernandes <joelf@ti.com> | 2013-08-17 22:42:34 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-08-21 07:28:05 -0400 |
commit | bce2a22885e657099d9f2cf82269bb4629ba744d (patch) | |
tree | 8c324b12d91aebdd09750f0d5e92618e39fe6d69 /drivers/crypto/omap-aes.c | |
parent | 05007c10ff76a9d6d85c007fe3a7f531611fda5c (diff) |
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/omap-aes.c')
-rw-r--r-- | drivers/crypto/omap-aes.c | 6 |
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) | |||
1207 | goto err_irq; | 1207 | goto err_irq; |
1208 | } | 1208 | } |
1209 | 1209 | ||
1210 | err = request_irq(irq, omap_aes_irq, 0, | 1210 | err = devm_request_irq(dev, irq, omap_aes_irq, 0, |
1211 | dev_name(dev), dd); | 1211 | dev_name(dev), dd); |
1212 | if (err) { | 1212 | if (err) { |
1213 | dev_err(dev, "Unable to grab omap-aes IRQ\n"); | 1213 | dev_err(dev, "Unable to grab omap-aes IRQ\n"); |
@@ -1242,9 +1242,7 @@ err_algs: | |||
1242 | for (j = dd->pdata->algs_info[i].registered - 1; j >= 0; j--) | 1242 | for (j = dd->pdata->algs_info[i].registered - 1; j >= 0; j--) |
1243 | crypto_unregister_alg( | 1243 | crypto_unregister_alg( |
1244 | &dd->pdata->algs_info[i].algs_list[j]); | 1244 | &dd->pdata->algs_info[i].algs_list[j]); |
1245 | if (dd->pio_only) | 1245 | if (!dd->pio_only) |
1246 | free_irq(irq, dd); | ||
1247 | else | ||
1248 | omap_aes_dma_cleanup(dd); | 1246 | omap_aes_dma_cleanup(dd); |
1249 | err_irq: | 1247 | err_irq: |
1250 | tasklet_kill(&dd->done_task); | 1248 | tasklet_kill(&dd->done_task); |