Commit 8692881e authored by Lee Jones's avatar Lee Jones Committed by Samuel Ortiz

mfd: htc-pasic3: Convert to managed resources for allocating memory

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 2b0b5e2d
...@@ -147,7 +147,7 @@ static int __init pasic3_probe(struct platform_device *pdev) ...@@ -147,7 +147,7 @@ static int __init pasic3_probe(struct platform_device *pdev)
if (!request_mem_region(r->start, resource_size(r), "pasic3")) if (!request_mem_region(r->start, resource_size(r), "pasic3"))
return -EBUSY; return -EBUSY;
asic = kzalloc(sizeof(struct pasic3_data), GFP_KERNEL); asic = devm_kzalloc(dev, sizeof(struct pasic3_data), GFP_KERNEL);
if (!asic) if (!asic)
return -ENOMEM; return -ENOMEM;
...@@ -156,7 +156,6 @@ static int __init pasic3_probe(struct platform_device *pdev) ...@@ -156,7 +156,6 @@ static int __init pasic3_probe(struct platform_device *pdev)
asic->mapping = ioremap(r->start, resource_size(r)); asic->mapping = ioremap(r->start, resource_size(r));
if (!asic->mapping) { if (!asic->mapping) {
dev_err(dev, "couldn't ioremap PASIC3\n"); dev_err(dev, "couldn't ioremap PASIC3\n");
kfree(asic);
return -ENOMEM; return -ENOMEM;
} }
...@@ -195,7 +194,6 @@ static int pasic3_remove(struct platform_device *pdev) ...@@ -195,7 +194,6 @@ static int pasic3_remove(struct platform_device *pdev)
iounmap(asic->mapping); iounmap(asic->mapping);
r = platform_get_resource(pdev, IORESOURCE_MEM, 0); r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(r->start, resource_size(r)); release_mem_region(r->start, resource_size(r));
kfree(asic);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment