Skip to content

Commit f80fa80

Browse files
committed
pmdomain: core: Use genpd->opp_table to simplify error/remove path
While we add an OF-provider we may, based upon a specific condition, also assign genpd->opp_table. Rather using the same specific condition in the error/remove path, let's check genpd->opp_table instead as it makes the code easier. Reviewed-by: Abel Vesa <abel.vesa@linaro.org> Tested-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Link: https://lore.kernel.org/r/20250417142513.312939-4-ulf.hansson@linaro.org
1 parent f34a067 commit f80fa80

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/pmdomain/core.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2343,6 +2343,7 @@ int pm_genpd_init(struct generic_pm_domain *genpd,
23432343
genpd->provider = NULL;
23442344
genpd->device_id = -ENXIO;
23452345
genpd->has_provider = false;
2346+
genpd->opp_table = NULL;
23462347
genpd->accounting_time = ktime_get_mono_fast_ns();
23472348
genpd->domain.ops.runtime_suspend = genpd_runtime_suspend;
23482349
genpd->domain.ops.runtime_resume = genpd_runtime_resume;
@@ -2617,7 +2618,7 @@ int of_genpd_add_provider_simple(struct device_node *np,
26172618

26182619
ret = genpd_add_provider(np, genpd_xlate_simple, genpd);
26192620
if (ret) {
2620-
if (!genpd_is_opp_table_fw(genpd) && genpd->set_performance_state) {
2621+
if (genpd->opp_table) {
26212622
dev_pm_opp_put_opp_table(genpd->opp_table);
26222623
dev_pm_opp_of_remove_table(&genpd->dev);
26232624
}
@@ -2697,7 +2698,7 @@ int of_genpd_add_provider_onecell(struct device_node *np,
26972698
genpd->provider = NULL;
26982699
genpd->has_provider = false;
26992700

2700-
if (!genpd_is_opp_table_fw(genpd) && genpd->set_performance_state) {
2701+
if (genpd->opp_table) {
27012702
dev_pm_opp_put_opp_table(genpd->opp_table);
27022703
dev_pm_opp_of_remove_table(&genpd->dev);
27032704
}
@@ -2729,11 +2730,10 @@ void of_genpd_del_provider(struct device_node *np)
27292730
if (gpd->provider == &np->fwnode) {
27302731
gpd->has_provider = false;
27312732

2732-
if (genpd_is_opp_table_fw(gpd) || !gpd->set_performance_state)
2733-
continue;
2734-
2735-
dev_pm_opp_put_opp_table(gpd->opp_table);
2736-
dev_pm_opp_of_remove_table(&gpd->dev);
2733+
if (gpd->opp_table) {
2734+
dev_pm_opp_put_opp_table(gpd->opp_table);
2735+
dev_pm_opp_of_remove_table(&gpd->dev);
2736+
}
27372737
}
27382738
}
27392739

0 commit comments

Comments
 (0)