Commit 0de9c387 authored by Lokesh Vutla's avatar Lokesh Vutla Committed by Herbert Xu

crypto: omap-sham - Convert to devm_request_irq()

Using devm_request_irq() rather than request_irq().
So removing free_irq() calls from the probe error
path and the remove handler.
Signed-off-by: default avatarLokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7d7c704d
...@@ -1896,10 +1896,11 @@ static int omap_sham_probe(struct platform_device *pdev) ...@@ -1896,10 +1896,11 @@ static int omap_sham_probe(struct platform_device *pdev)
} }
dd->phys_base = res.start; dd->phys_base = res.start;
err = request_irq(dd->irq, dd->pdata->intr_hdlr, IRQF_TRIGGER_LOW, err = devm_request_irq(dev, dd->irq, dd->pdata->intr_hdlr,
dev_name(dev), dd); IRQF_TRIGGER_NONE, dev_name(dev), dd);
if (err) { if (err) {
dev_err(dev, "unable to request irq.\n"); dev_err(dev, "unable to request irq %d, err = %d\n",
dd->irq, err);
goto res_err; goto res_err;
} }
...@@ -1912,7 +1913,7 @@ static int omap_sham_probe(struct platform_device *pdev) ...@@ -1912,7 +1913,7 @@ static int omap_sham_probe(struct platform_device *pdev)
dev_err(dev, "unable to obtain RX DMA engine channel %u\n", dev_err(dev, "unable to obtain RX DMA engine channel %u\n",
dd->dma); dd->dma);
err = -ENXIO; err = -ENXIO;
goto dma_err; goto res_err;
} }
dd->flags |= dd->pdata->flags; dd->flags |= dd->pdata->flags;
...@@ -1950,8 +1951,6 @@ static int omap_sham_probe(struct platform_device *pdev) ...@@ -1950,8 +1951,6 @@ static int omap_sham_probe(struct platform_device *pdev)
&dd->pdata->algs_info[i].algs_list[j]); &dd->pdata->algs_info[i].algs_list[j]);
pm_runtime_disable(dev); pm_runtime_disable(dev);
dma_release_channel(dd->dma_lch); dma_release_channel(dd->dma_lch);
dma_err:
free_irq(dd->irq, dd);
res_err: res_err:
kfree(dd); kfree(dd);
dd = NULL; dd = NULL;
...@@ -1979,7 +1978,6 @@ static int omap_sham_remove(struct platform_device *pdev) ...@@ -1979,7 +1978,6 @@ static int omap_sham_remove(struct platform_device *pdev)
tasklet_kill(&dd->done_task); tasklet_kill(&dd->done_task);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
dma_release_channel(dd->dma_lch); dma_release_channel(dd->dma_lch);
free_irq(dd->irq, dd);
kfree(dd); kfree(dd);
dd = NULL; dd = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment