Skip to content

Commit 83710aa

Browse files
committed
Merge tag 'devfreq-next-for-6.12' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux
Merge devfreq updates for v6.12 from Chanwoo Choi: "Detailed description for this pull request: - Add missing MODULE_DESCRIPTION() macros for devfreq governors. - Use Use devm_clk_get_enabled() helpers for exyns-bus devfreq driver. - Use of_property_present() instead of of_get_property() for imx-bus devfreq driver." * tag 'devfreq-next-for-6.12' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux: PM / devfreq: imx-bus: Use of_property_present() PM / devfreq: exynos: Use Use devm_clk_get_enabled() helpers PM/devfreq: governor: add missing MODULE_DESCRIPTION() macros
2 parents da3ea35 + d475521 commit 83710aa

File tree

6 files changed

+10
-18
lines changed

6 files changed

+10
-18
lines changed

drivers/devfreq/exynos-bus.c

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ static void exynos_bus_exit(struct device *dev)
160160
platform_device_unregister(bus->icc_pdev);
161161

162162
dev_pm_opp_of_remove_table(dev);
163-
clk_disable_unprepare(bus->clk);
164163
dev_pm_opp_put_regulators(bus->opp_token);
165164
}
166165

@@ -171,7 +170,6 @@ static void exynos_bus_passive_exit(struct device *dev)
171170
platform_device_unregister(bus->icc_pdev);
172171

173172
dev_pm_opp_of_remove_table(dev);
174-
clk_disable_unprepare(bus->clk);
175173
}
176174

177175
static int exynos_bus_parent_parse_of(struct device_node *np,
@@ -247,23 +245,16 @@ static int exynos_bus_parse_of(struct device_node *np,
247245
int ret;
248246

249247
/* Get the clock to provide each bus with source clock */
250-
bus->clk = devm_clk_get(dev, "bus");
251-
if (IS_ERR(bus->clk)) {
252-
dev_err(dev, "failed to get bus clock\n");
253-
return PTR_ERR(bus->clk);
254-
}
255-
256-
ret = clk_prepare_enable(bus->clk);
257-
if (ret < 0) {
258-
dev_err(dev, "failed to get enable clock\n");
259-
return ret;
260-
}
248+
bus->clk = devm_clk_get_enabled(dev, "bus");
249+
if (IS_ERR(bus->clk))
250+
return dev_err_probe(dev, PTR_ERR(bus->clk),
251+
"failed to get bus clock\n");
261252

262253
/* Get the freq and voltage from OPP table to scale the bus freq */
263254
ret = dev_pm_opp_of_add_table(dev);
264255
if (ret < 0) {
265256
dev_err(dev, "failed to get OPP table\n");
266-
goto err_clk;
257+
return ret;
267258
}
268259

269260
rate = clk_get_rate(bus->clk);
@@ -281,8 +272,6 @@ static int exynos_bus_parse_of(struct device_node *np,
281272

282273
err_opp:
283274
dev_pm_opp_of_remove_table(dev);
284-
err_clk:
285-
clk_disable_unprepare(bus->clk);
286275

287276
return ret;
288277
}
@@ -453,7 +442,6 @@ static int exynos_bus_probe(struct platform_device *pdev)
453442

454443
err:
455444
dev_pm_opp_of_remove_table(dev);
456-
clk_disable_unprepare(bus->clk);
457445
err_reg:
458446
dev_pm_opp_put_regulators(bus->opp_token);
459447

drivers/devfreq/governor_performance.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,5 @@ static void __exit devfreq_performance_exit(void)
5858
return;
5959
}
6060
module_exit(devfreq_performance_exit);
61+
MODULE_DESCRIPTION("DEVFREQ Performance governor");
6162
MODULE_LICENSE("GPL");

drivers/devfreq/governor_powersave.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,5 @@ static void __exit devfreq_powersave_exit(void)
5858
return;
5959
}
6060
module_exit(devfreq_powersave_exit);
61+
MODULE_DESCRIPTION("DEVFREQ Powersave governor");
6162
MODULE_LICENSE("GPL");

drivers/devfreq/governor_simpleondemand.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,5 @@ static void __exit devfreq_simple_ondemand_exit(void)
140140
return;
141141
}
142142
module_exit(devfreq_simple_ondemand_exit);
143+
MODULE_DESCRIPTION("DEVFREQ Simple On-demand governor");
143144
MODULE_LICENSE("GPL");

drivers/devfreq/governor_userspace.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,5 @@ static void __exit devfreq_userspace_exit(void)
153153
return;
154154
}
155155
module_exit(devfreq_userspace_exit);
156+
MODULE_DESCRIPTION("DEVFREQ Userspace governor");
156157
MODULE_LICENSE("GPL");

drivers/devfreq/imx-bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static int imx_bus_init_icc(struct device *dev)
5959
struct imx_bus *priv = dev_get_drvdata(dev);
6060
const char *icc_driver_name;
6161

62-
if (!of_get_property(dev->of_node, "#interconnect-cells", NULL))
62+
if (!of_property_present(dev->of_node, "#interconnect-cells"))
6363
return 0;
6464
if (!IS_ENABLED(CONFIG_INTERCONNECT_IMX)) {
6565
dev_warn(dev, "imx interconnect drivers disabled\n");

0 commit comments

Comments
 (0)