p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clk: sprd: Switch from of_iomap() to devm_ioremap_resource() 

devm_ioremap_resources() automatically requests resources and devm_ wrappers
do better error handling and unmapping of the I/O region when needed,
that would make drivers more clean and simple.

Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
Reviewed-by: Baolin Wang <baolin.wang@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
Chunyan Zhang 2019-05-22 09:15:01 +08:00 committed by Stephen Boyd
parent a188339ca5
commit 69b39d2503
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/clk/sprd/common.c
View File

@ -42,6 +42,7 @@ int sprd_clk_regmap_init(struct platform_device *pdev,
void __iomem *base; void __iomem *base;
struct device_node *node = pdev->dev.of_node; struct device_node *node = pdev->dev.of_node;
struct regmap *regmap; struct regmap *regmap;
struct resource *res;
if (of_find_property(node, "sprd,syscon", NULL)) { if (of_find_property(node, "sprd,syscon", NULL)) {
regmap = syscon_regmap_lookup_by_phandle(node, "sprd,syscon"); regmap = syscon_regmap_lookup_by_phandle(node, "sprd,syscon");
@ -50,7 +51,11 @@ int sprd_clk_regmap_init(struct platform_device *pdev,
return PTR_ERR(regmap); return PTR_ERR(regmap);
} }
} else { } else {
base = of_iomap(node, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(base))
return PTR_ERR(base);
regmap = devm_regmap_init_mmio(&pdev->dev, base, regmap = devm_regmap_init_mmio(&pdev->dev, base,
&sprdclk_regmap_config); &sprdclk_regmap_config);
if (IS_ERR_OR_NULL(regmap)) { if (IS_ERR_OR_NULL(regmap)) {