mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-26 10:49:33 +00:00
Code Issues Releases Wiki Activity

crypto: dcp - Use devm_* APIs

Browse source 
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>
This commit is contained in:
Sachin Kamat 2013-05-29 17:09:10 +05:30 committed by Herbert Xu
parent d6dfd683e6
commit 0bc8a7188f
1 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/crypto/dcp.c
View file

@ -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 @@ static int dcp_probe(struct platform_device *pdev)
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;
}