aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/htc-pasic3.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-05-23 11:25:14 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-06-13 06:11:44 -0400
commit8692881e38644383398affaa68fcabc0299a4d7f (patch)
treee7e1823f30574aa8f483d10ff378ddaf4327c1ec /drivers/mfd/htc-pasic3.c
parent2b0b5e2dfe663f53bd07eafa01df9809edf6327e (diff)
mfd: htc-pasic3: 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>
Diffstat (limited to 'drivers/mfd/htc-pasic3.c')
-rw-r--r--drivers/mfd/htc-pasic3.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mfd/htc-pasic3.c b/drivers/mfd/htc-pasic3.c
index 0285fceb99a6..0a5e85fd8517 100644
--- a/drivers/mfd/htc-pasic3.c
+++ b/drivers/mfd/htc-pasic3.c
@@ -147,7 +147,7 @@ static int __init pasic3_probe(struct platform_device *pdev)
147 if (!request_mem_region(r->start, resource_size(r), "pasic3")) 147 if (!request_mem_region(r->start, resource_size(r), "pasic3"))
148 return -EBUSY; 148 return -EBUSY;
149 149
150 asic = kzalloc(sizeof(struct pasic3_data), GFP_KERNEL); 150 asic = devm_kzalloc(dev, sizeof(struct pasic3_data), GFP_KERNEL);
151 if (!asic) 151 if (!asic)
152 return -ENOMEM; 152 return -ENOMEM;
153 153
@@ -156,7 +156,6 @@ static int __init pasic3_probe(struct platform_device *pdev)
156 asic->mapping = ioremap(r->start, resource_size(r)); 156 asic->mapping = ioremap(r->start, resource_size(r));
157 if (!asic->mapping) { 157 if (!asic->mapping) {
158 dev_err(dev, "couldn't ioremap PASIC3\n"); 158 dev_err(dev, "couldn't ioremap PASIC3\n");
159 kfree(asic);
160 return -ENOMEM; 159 return -ENOMEM;
161 } 160 }
162 161
@@ -195,7 +194,6 @@ static int pasic3_remove(struct platform_device *pdev)
195 iounmap(asic->mapping); 194 iounmap(asic->mapping);
196 r = platform_get_resource(pdev, IORESOURCE_MEM, 0); 195 r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
197 release_mem_region(r->start, resource_size(r)); 196 release_mem_region(r->start, resource_size(r));
198 kfree(asic);
199 return 0; 197 return 0;
200} 198}
201 199