summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-05-29 17:09:10 +0530
committerHerbert Xu <herbert@gondor.apana.org.au>2013-06-05 16:43:07 +0800
commit0bc8a7188ff1b9b1cca2e49fd78f0e1797a75631 (patch)
tree5ae92c4fad6705d2bcf4f27bb94bfb076a7a1614
parentd6dfd683e6b196db4cf92cf226c9f63ee66a5eb1 (diff)
downloadlinux-0bc8a7188ff1b9b1cca2e49fd78f0e1797a75631.tar.bz2
crypto: dcp - Use devm_* APIs
devm_* APIs are device managed and make cleanup and exit code simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Tested-by: Tobias Rauter <tobiasrauter@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/dcp.c32
1 files changed, 10 insertions, 22 deletions
diff --git a/drivers/crypto/dcp.c b/drivers/crypto/dcp.c
index 83eaefcefb64..9e91c2cf3bf8 100644
--- a/drivers/crypto/dcp.c
+++ b/drivers/crypto/dcp.c
@@ -723,12 +723,10 @@ static int dcp_probe(struct platform_device *pdev)
struct resource *r;
int i, ret, j;
- dev = kzalloc(sizeof(*dev), GFP_KERNEL);
- if (dev == NULL) {
- dev_err(&pdev->dev, "Failed to allocate structure\n");
- ret = -ENOMEM;
- goto err;
- }
+ dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
+ if (!dev)
+ return -ENOMEM;
+
global_dev = dev;
dev->dev = &pdev->dev;
@@ -737,11 +735,10 @@ static int dcp_probe(struct platform_device *pdev)
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!r) {
dev_err(&pdev->dev, "failed to get IORESOURCE_MEM\n");
- ret = -ENXIO;
- goto err_dev;
+ return -ENXIO;
}
- dev->dcp_regs_base = ioremap(r->start, resource_size(r));
-
+ dev->dcp_regs_base = devm_ioremap(&pdev->dev, r->start,
+ resource_size(r));
dcp_set(dev, DCP_CTRL_SFRST, DCP_REG_CTRL);
udelay(10);
@@ -762,15 +759,13 @@ static int dcp_probe(struct platform_device *pdev)
r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!r) {
dev_err(&pdev->dev, "can't get IRQ resource (0)\n");
- ret = -EIO;
- goto err_unmap_mem;
+ return -EIO;
}
dev->dcp_vmi_irq = r->start;
ret = request_irq(dev->dcp_vmi_irq, dcp_vmi_irq, 0, "dcp", dev);
if (ret != 0) {
dev_err(&pdev->dev, "can't request_irq (0)\n");
- ret = -EIO;
- goto err_unmap_mem;
+ return -EIO;
}
r = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
@@ -863,11 +858,7 @@ err_free_irq1:
free_irq(dev->dcp_irq, dev);
err_free_irq0:
free_irq(dev->dcp_vmi_irq, dev);
-err_unmap_mem:
- iounmap((void *) dev->dcp_regs_base);
-err_dev:
- kfree(dev);
-err:
+
return ret;
}
@@ -890,14 +881,11 @@ static int dcp_remove(struct platform_device *pdev)
tasklet_kill(&dev->done_task);
tasklet_kill(&dev->queue_task);
- iounmap((void *) dev->dcp_regs_base);
-
for (j = 0; j < ARRAY_SIZE(algs); j++)
crypto_unregister_alg(&algs[j]);
misc_deregister(&dev->dcp_bootstream_misc);
- kfree(dev);
return 0;
}