* [lm-sensors] [PATCH] hwmon: exynos4_tmu: Use devm_* functions
@ 2012-07-13 8:58 Sachin Kamat
0 siblings, 0 replies; only message in thread
From: Sachin Kamat @ 2012-07-13 8:58 UTC (permalink / raw)
To: lm-sensors
devm_* functions are used to replace kzalloc, request_mem_region, ioremap
and request_irq functions in probe call. With the usage of devm_* functions
explicit freeing and unmapping is not required.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
drivers/hwmon/exynos4_tmu.c | 44 ++++++++----------------------------------
1 files changed, 9 insertions(+), 35 deletions(-)
diff --git a/drivers/hwmon/exynos4_tmu.c b/drivers/hwmon/exynos4_tmu.c
index e912059..ee6e26c 100644
--- a/drivers/hwmon/exynos4_tmu.c
+++ b/drivers/hwmon/exynos4_tmu.c
@@ -356,7 +356,8 @@ static int __devinit exynos4_tmu_probe(struct platform_device *pdev)
return -ENODEV;
}
- data = kzalloc(sizeof(struct exynos4_tmu_data), GFP_KERNEL);
+ data = devm_kzalloc(&pdev->dev, sizeof(struct exynos4_tmu_data),
+ GFP_KERNEL);
if (!data) {
dev_err(&pdev->dev, "Failed to allocate driver structure\n");
return -ENOMEM;
@@ -364,48 +365,36 @@ static int __devinit exynos4_tmu_probe(struct platform_device *pdev)
data->irq = platform_get_irq(pdev, 0);
if (data->irq < 0) {
- ret = data->irq;
dev_err(&pdev->dev, "Failed to get platform irq\n");
- goto err_free;
+ return data->irq;
}
INIT_WORK(&data->irq_work, exynos4_tmu_work);
data->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!data->mem) {
- ret = -ENOENT;
dev_err(&pdev->dev, "Failed to get platform resource\n");
- goto err_free;
+ return -ENOENT;
}
- data->mem = request_mem_region(data->mem->start,
- resource_size(data->mem), pdev->name);
- if (!data->mem) {
- ret = -ENODEV;
- dev_err(&pdev->dev, "Failed to request memory region\n");
- goto err_free;
- }
-
- data->base = ioremap(data->mem->start, resource_size(data->mem));
+ data->base = devm_request_and_ioremap(&pdev->dev, data->mem);
if (!data->base) {
- ret = -ENODEV;
dev_err(&pdev->dev, "Failed to ioremap memory\n");
- goto err_mem_region;
+ return -ENODEV;
}
- ret = request_irq(data->irq, exynos4_tmu_irq,
+ ret = devm_request_irq(&pdev->dev, data->irq, exynos4_tmu_irq,
IRQF_TRIGGER_RISING,
"exynos4-tmu", data);
if (ret) {
dev_err(&pdev->dev, "Failed to request irq: %d\n", data->irq);
- goto err_io_remap;
+ return ret;
}
data->clk = clk_get(NULL, "tmu_apbif");
if (IS_ERR(data->clk)) {
- ret = PTR_ERR(data->clk);
dev_err(&pdev->dev, "Failed to get clock\n");
- goto err_irq;
+ return PTR_ERR(data->clk);
}
data->pdata = pdata;
@@ -440,14 +429,6 @@ err_create_group:
err_clk:
platform_set_drvdata(pdev, NULL);
clk_put(data->clk);
-err_irq:
- free_irq(data->irq, data);
-err_io_remap:
- iounmap(data->base);
-err_mem_region:
- release_mem_region(data->mem->start, resource_size(data->mem));
-err_free:
- kfree(data);
return ret;
}
@@ -463,15 +444,8 @@ static int __devexit exynos4_tmu_remove(struct platform_device *pdev)
clk_put(data->clk);
- free_irq(data->irq, data);
-
- iounmap(data->base);
- release_mem_region(data->mem->start, resource_size(data->mem));
-
platform_set_drvdata(pdev, NULL);
- kfree(data);
-
return 0;
}
--
1.7.4.1
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-07-13 8:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-13 8:58 [lm-sensors] [PATCH] hwmon: exynos4_tmu: Use devm_* functions Sachin Kamat
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.