OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfd: asic3: Convert to managed resources for allocating memory 

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Lee Jones 2013-05-23 16:25:09 +01:00 committed by Samuel Ortiz
parent 76ba0b896b
commit 1cee87fdf1
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/mfd/asic3.c
View File

@ -958,7 +958,8 @@ static int __init asic3_probe(struct platform_device *pdev)
unsigned long clksel; unsigned long clksel;
int ret = 0; int ret = 0;
asic = kzalloc(sizeof(struct asic3), GFP_KERNEL); asic = devm_kzalloc(&pdev->dev,
sizeof(struct asic3), GFP_KERNEL);
if (asic == NULL) { if (asic == NULL) {
printk(KERN_ERR "kzalloc failed\n"); printk(KERN_ERR "kzalloc failed\n");
return -ENOMEM; return -ENOMEM;
@ -970,16 +971,14 @@ static int __init asic3_probe(struct platform_device *pdev)
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) { if (!mem) {
ret = -ENOMEM;
dev_err(asic->dev, "no MEM resource\n"); dev_err(asic->dev, "no MEM resource\n");
goto out_free; return -ENOMEM;
} }
asic->mapping = ioremap(mem->start, resource_size(mem)); asic->mapping = ioremap(mem->start, resource_size(mem));
if (!asic->mapping) { if (!asic->mapping) {
ret = -ENOMEM;
dev_err(asic->dev, "Couldn't ioremap\n"); dev_err(asic->dev, "Couldn't ioremap\n");
goto out_free; return -ENOMEM;
} }
asic->irq_base = pdata->irq_base; asic->irq_base = pdata->irq_base;
@ -1033,9 +1032,6 @@ static int __init asic3_probe(struct platform_device *pdev)
out_unmap: out_unmap:
iounmap(asic->mapping); iounmap(asic->mapping);
out_free:
kfree(asic);
return ret; return ret;
} }
@ -1058,8 +1054,6 @@ static int asic3_remove(struct platform_device *pdev)
iounmap(asic->mapping); iounmap(asic->mapping);
kfree(asic);
return 0; return 0;
} }