summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Kucheria <amit.kucheria@linaro.org>2018-07-26 16:03:09 +0530
committerEduardo Valentin <edubezval@gmail.com>2018-07-27 15:15:57 -0700
commitfaa590baf8dfe5ad877e062f18de4419e4d174f7 (patch)
treeb646d610f781095223ad21fb322c4acb5f7b0da6
parente0fe01426c50f54d06b6ff69de2be536ec0a3256 (diff)
downloadlinux-stable-faa590baf8dfe5ad877e062f18de4419e4d174f7.tar.gz
linux-stable-faa590baf8dfe5ad877e062f18de4419e4d174f7.tar.bz2
linux-stable-faa590baf8dfe5ad877e062f18de4419e4d174f7.zip
thermal: tsens: switch from of_iomap() to devm_ioremap_resource()
devm_ioremap_resources() automatically requests resources (so that the I/O region shows up in /proc/iomem) and devm_ wrappers do better error handling and unmapping of the I/O region when needed. Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> Reviewed-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
-rw-r--r--drivers/thermal/qcom/tsens-common.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
index 25e7f247b027..6207d8d92351 100644
--- a/drivers/thermal/qcom/tsens-common.c
+++ b/drivers/thermal/qcom/tsens-common.c
@@ -127,13 +127,11 @@ static const struct regmap_config tsens_config = {
int __init init_common(struct tsens_device *tmdev)
{
void __iomem *base;
+ struct resource *res;
struct platform_device *op = of_find_device_by_node(tmdev->dev->of_node);
if (!op)
return -EINVAL;
- base = of_iomap(tmdev->dev->of_node, 0);
- if (!base)
- return -EINVAL;
/* The driver only uses the TM register address space for now */
if (op->num_resources > 1) {
@@ -143,11 +141,14 @@ int __init init_common(struct tsens_device *tmdev)
tmdev->tm_offset = 0x1000;
}
+ res = platform_get_resource(op, IORESOURCE_MEM, 0);
+ base = devm_ioremap_resource(&op->dev, res);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
+
tmdev->map = devm_regmap_init_mmio(tmdev->dev, base, &tsens_config);
- if (IS_ERR(tmdev->map)) {
- iounmap(base);
+ if (IS_ERR(tmdev->map))
return PTR_ERR(tmdev->map);
- }
return 0;
}