NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PM / devfreq: rockchip-dfi: Make pmu regmap mandatory

Browse source 
[ Upstream commit 1e0731c05c985deb68a97fa44c1adcd3305dda90 ]

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/20230704093242.583575-2-s.hauer@pengutronix.de/
Fixes: b9d1262bca ("PM / devfreq: event: support rockchip dfi controller")
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sascha Hauer 2023-07-04 11:32:17 +02:00 • committed by Greg Kroah-Hartman
parent 0d30931f1f
commit f64a559f2d
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/devfreq/event/rockchip-dfi.c
View file

@ -193,14 +193,15 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
return dev_err_probe(dev, PTR_ERR(data->clk), return dev_err_probe(dev, PTR_ERR(data->clk),
"Cannot get the clk pclk_ddr_mon\n"); "Cannot get the clk pclk_ddr_mon\n");
/* try to find the optional reference to the pmu syscon */
node = of_parse_phandle(np, "rockchip,pmu", 0); node = of_parse_phandle(np, "rockchip,pmu", 0);
if (node) { if (!node)
data->regmap_pmu = syscon_node_to_regmap(node); return dev_err_probe(&pdev->dev, -ENODEV, "Can't find pmu_grf registers\n");
of_node_put(node);
if (IS_ERR(data->regmap_pmu)) data->regmap_pmu = syscon_node_to_regmap(node);
return PTR_ERR(data->regmap_pmu); of_node_put(node);
} if (IS_ERR(data->regmap_pmu))
return PTR_ERR(data->regmap_pmu);
data->dev = dev; data->dev = dev;
desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL); desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL);