evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

crypto: dcp - Use devm_request_irq()

Browse source 
Using Use devm_request_irq() can make the code smaller and simpler, as we do
not need to call free_irq() in the probe error path and in the remove function.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Fabio Estevam 2013-09-22 14:42:26 -03:00 • committed by Herbert Xu
parent 05a27928f3
commit 0ff647551b
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/crypto/dcp.c
View file

@ -757,7 +757,8 @@ static int dcp_probe(struct platform_device *pdev)
return -EIO; return -EIO;
} }
dev->dcp_vmi_irq = r->start; dev->dcp_vmi_irq = r->start;
ret = request_irq(dev->dcp_vmi_irq, dcp_vmi_irq, 0, "dcp", dev); ret = devm_request_irq(&pdev->dev, dev->dcp_vmi_irq, dcp_vmi_irq, 0,
"dcp", dev);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, "can't request_irq (0)\n"); dev_err(&pdev->dev, "can't request_irq (0)\n");
return -EIO; return -EIO;
@ -766,15 +767,14 @@ static int dcp_probe(struct platform_device *pdev)
r = platform_get_resource(pdev, IORESOURCE_IRQ, 1); r = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
if (!r) { if (!r) {
dev_err(&pdev->dev, "can't get IRQ resource (1)\n"); dev_err(&pdev->dev, "can't get IRQ resource (1)\n");
ret = -EIO; return -EIO;
goto err_free_irq0;
} }
dev->dcp_irq = r->start; dev->dcp_irq = r->start;
ret = request_irq(dev->dcp_irq, dcp_irq, 0, "dcp", dev); ret = devm_request_irq(&pdev->dev, dev->dcp_irq, dcp_irq, 0, "dcp",
dev);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, "can't request_irq (1)\n"); dev_err(&pdev->dev, "can't request_irq (1)\n");
ret = -EIO; return -EIO;
goto err_free_irq0;
} }
dev->hw_pkg[0] = dma_alloc_coherent(&pdev->dev, dev->hw_pkg[0] = dma_alloc_coherent(&pdev->dev,
@ -783,8 +783,7 @@ static int dcp_probe(struct platform_device *pdev)
GFP_KERNEL); GFP_KERNEL);
if (!dev->hw_pkg[0]) { if (!dev->hw_pkg[0]) {
dev_err(&pdev->dev, "Could not allocate hw descriptors\n"); dev_err(&pdev->dev, "Could not allocate hw descriptors\n");
ret = -ENOMEM; return -ENOMEM;
goto err_free_irq1;
} }
for (i = 1; i < DCP_MAX_PKG; i++) { for (i = 1; i < DCP_MAX_PKG; i++) {
@ -849,10 +848,6 @@ err_free_hw_packet:
dma_free_coherent(&pdev->dev, DCP_MAX_PKG * dma_free_coherent(&pdev->dev, DCP_MAX_PKG *
sizeof(struct dcp_hw_packet), dev->hw_pkg[0], sizeof(struct dcp_hw_packet), dev->hw_pkg[0],
dev->hw_phys_pkg); dev->hw_phys_pkg);
err_free_irq1:
free_irq(dev->dcp_irq, dev);
err_free_irq0:
free_irq(dev->dcp_vmi_irq, dev);
return ret; return ret;
} }
@ -870,9 +865,6 @@ static int dcp_remove(struct platform_device *pdev)
dma_free_coherent(&pdev->dev, 2 * AES_KEYSIZE_128, dev->payload_base, dma_free_coherent(&pdev->dev, 2 * AES_KEYSIZE_128, dev->payload_base,
dev->payload_base_dma); dev->payload_base_dma);
free_irq(dev->dcp_irq, dev);
free_irq(dev->dcp_vmi_irq, dev);
tasklet_kill(&dev->done_task); tasklet_kill(&dev->done_task);
tasklet_kill(&dev->queue_task); tasklet_kill(&dev->queue_task);