* [PATCH 2/3] crypto: dcp: Use devm_request_irq()
2013-09-22 17:42 [PATCH 1/3] crypto: dcp: Use devm_ioremap_resource() Fabio Estevam
@ 2013-09-22 17:42 ` Fabio Estevam
2013-09-22 17:42 ` [PATCH 3/3] crypto: dcp: Fix the path for releasing the resources Fabio Estevam
2013-09-23 20:09 ` [PATCH 1/3] crypto: dcp - Use devm_ioremap_resource() Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Fabio Estevam @ 2013-09-22 17:42 UTC (permalink / raw)
To: herbert; +Cc: tobias.rauter, linux-crypto, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
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>
---
drivers/crypto/dcp.c | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/drivers/crypto/dcp.c b/drivers/crypto/dcp.c
index 90a7cb7..93ab753 100644
--- a/drivers/crypto/dcp.c
+++ b/drivers/crypto/dcp.c
@@ -757,7 +757,8 @@ static int dcp_probe(struct platform_device *pdev)
return -EIO;
}
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) {
dev_err(&pdev->dev, "can't request_irq (0)\n");
return -EIO;
@@ -766,15 +767,14 @@ static int dcp_probe(struct platform_device *pdev)
r = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
if (!r) {
dev_err(&pdev->dev, "can't get IRQ resource (1)\n");
- ret = -EIO;
- goto err_free_irq0;
+ return -EIO;
}
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) {
dev_err(&pdev->dev, "can't request_irq (1)\n");
- ret = -EIO;
- goto err_free_irq0;
+ return -EIO;
}
dev->hw_pkg[0] = dma_alloc_coherent(&pdev->dev,
@@ -783,8 +783,7 @@ static int dcp_probe(struct platform_device *pdev)
GFP_KERNEL);
if (!dev->hw_pkg[0]) {
dev_err(&pdev->dev, "Could not allocate hw descriptors\n");
- ret = -ENOMEM;
- goto err_free_irq1;
+ return -ENOMEM;
}
for (i = 1; i < DCP_MAX_PKG; i++) {
@@ -849,10 +848,6 @@ err_free_hw_packet:
dma_free_coherent(&pdev->dev, DCP_MAX_PKG *
sizeof(struct dcp_hw_packet), dev->hw_pkg[0],
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;
}
@@ -870,9 +865,6 @@ static int dcp_remove(struct platform_device *pdev)
dma_free_coherent(&pdev->dev, 2 * AES_KEYSIZE_128, dev->payload_base,
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->queue_task);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] crypto: dcp: Fix the path for releasing the resources
2013-09-22 17:42 [PATCH 1/3] crypto: dcp: Use devm_ioremap_resource() Fabio Estevam
2013-09-22 17:42 ` [PATCH 2/3] crypto: dcp: Use devm_request_irq() Fabio Estevam
@ 2013-09-22 17:42 ` Fabio Estevam
2013-09-23 20:09 ` [PATCH 1/3] crypto: dcp - Use devm_ioremap_resource() Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Fabio Estevam @ 2013-09-22 17:42 UTC (permalink / raw)
To: herbert; +Cc: tobias.rauter, linux-crypto, Fabio Estevam
From: Fabio Estevam <fabio.estevam@freescale.com>
tasklet_kill() is not being called in probe and the remove function releases
the resources in the wrong order.
Fix these issues.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
drivers/crypto/dcp.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/crypto/dcp.c b/drivers/crypto/dcp.c
index 93ab753..38d7a9f 100644
--- a/drivers/crypto/dcp.c
+++ b/drivers/crypto/dcp.c
@@ -842,6 +842,8 @@ err_unregister:
for (j = 0; j < i; j++)
crypto_unregister_alg(&algs[j]);
err_free_key_iv:
+ tasklet_kill(&dev->done_task);
+ tasklet_kill(&dev->queue_task);
dma_free_coherent(&pdev->dev, 2 * AES_KEYSIZE_128, dev->payload_base,
dev->payload_base_dma);
err_free_hw_packet:
@@ -857,21 +859,21 @@ static int dcp_remove(struct platform_device *pdev)
struct dcp_dev *dev;
int j;
dev = platform_get_drvdata(pdev);
+
+ misc_deregister(&dev->dcp_bootstream_misc);
- dma_free_coherent(&pdev->dev,
- DCP_MAX_PKG * sizeof(struct dcp_hw_packet),
- dev->hw_pkg[0], dev->hw_phys_pkg);
-
- dma_free_coherent(&pdev->dev, 2 * AES_KEYSIZE_128, dev->payload_base,
- dev->payload_base_dma);
+ for (j = 0; j < ARRAY_SIZE(algs); j++)
+ crypto_unregister_alg(&algs[j]);
tasklet_kill(&dev->done_task);
tasklet_kill(&dev->queue_task);
- for (j = 0; j < ARRAY_SIZE(algs); j++)
- crypto_unregister_alg(&algs[j]);
+ dma_free_coherent(&pdev->dev, 2 * AES_KEYSIZE_128, dev->payload_base,
+ dev->payload_base_dma);
- misc_deregister(&dev->dcp_bootstream_misc);
+ dma_free_coherent(&pdev->dev,
+ DCP_MAX_PKG * sizeof(struct dcp_hw_packet),
+ dev->hw_pkg[0], dev->hw_phys_pkg);
return 0;
}
--
1.8.1.2
^ permalink raw reply related [flat|nested] 4+ messages in thread