Skip to content

Commit 1e0731c

Browse files
saschahauerchanwoochoi
authored andcommitted
PM / devfreq: rockchip-dfi: Make pmu regmap mandatory
As a matter of fact the regmap_pmu already is mandatory because it is used unconditionally in the driver. Bail out gracefully in probe() rather than crashing later. Link: https://lore.kernel.org/lkml/[email protected]/ Fixes: b9d1262 ("PM / devfreq: event: support rockchip dfi controller") Reviewed-by: Sebastian Reichel <[email protected]> Signed-off-by: Sascha Hauer <[email protected]> Signed-off-by: Chanwoo Choi <[email protected]>
1 parent 8b3bd6f commit 1e0731c

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

drivers/devfreq/event/rockchip-dfi.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,15 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
193193
return dev_err_probe(dev, PTR_ERR(data->clk),
194194
"Cannot get the clk pclk_ddr_mon\n");
195195

196-
/* try to find the optional reference to the pmu syscon */
197196
node = of_parse_phandle(np, "rockchip,pmu", 0);
198-
if (node) {
199-
data->regmap_pmu = syscon_node_to_regmap(node);
200-
of_node_put(node);
201-
if (IS_ERR(data->regmap_pmu))
202-
return PTR_ERR(data->regmap_pmu);
203-
}
197+
if (!node)
198+
return dev_err_probe(&pdev->dev, -ENODEV, "Can't find pmu_grf registers\n");
199+
200+
data->regmap_pmu = syscon_node_to_regmap(node);
201+
of_node_put(node);
202+
if (IS_ERR(data->regmap_pmu))
203+
return PTR_ERR(data->regmap_pmu);
204+
204205
data->dev = dev;
205206

206207
desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL);

0 commit comments

Comments
 (0)