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
This commit is contained in:
@@ -2343,6 +2343,7 @@ int pm_genpd_init(struct generic_pm_domain *genpd,
|
||||
genpd->provider = NULL;
|
||||
genpd->device_id = -ENXIO;
|
||||
genpd->has_provider = false;
|
||||
genpd->opp_table = NULL;
|
||||
genpd->accounting_time = ktime_get_mono_fast_ns();
|
||||
genpd->domain.ops.runtime_suspend = genpd_runtime_suspend;
|
||||
genpd->domain.ops.runtime_resume = genpd_runtime_resume;
|
||||
@@ -2617,7 +2618,7 @@ int of_genpd_add_provider_simple(struct device_node *np,
|
||||
|
||||
ret = genpd_add_provider(np, genpd_xlate_simple, genpd);
|
||||
if (ret) {
|
||||
if (!genpd_is_opp_table_fw(genpd) && genpd->set_performance_state) {
|
||||
if (genpd->opp_table) {
|
||||
dev_pm_opp_put_opp_table(genpd->opp_table);
|
||||
dev_pm_opp_of_remove_table(&genpd->dev);
|
||||
}
|
||||
@@ -2697,7 +2698,7 @@ error:
|
||||
genpd->provider = NULL;
|
||||
genpd->has_provider = false;
|
||||
|
||||
if (!genpd_is_opp_table_fw(genpd) && genpd->set_performance_state) {
|
||||
if (genpd->opp_table) {
|
||||
dev_pm_opp_put_opp_table(genpd->opp_table);
|
||||
dev_pm_opp_of_remove_table(&genpd->dev);
|
||||
}
|
||||
@@ -2729,11 +2730,10 @@ void of_genpd_del_provider(struct device_node *np)
|
||||
if (gpd->provider == &np->fwnode) {
|
||||
gpd->has_provider = false;
|
||||
|
||||
if (genpd_is_opp_table_fw(gpd) || !gpd->set_performance_state)
|
||||
continue;
|
||||
|
||||
dev_pm_opp_put_opp_table(gpd->opp_table);
|
||||
dev_pm_opp_of_remove_table(&gpd->dev);
|
||||
if (gpd->opp_table) {
|
||||
dev_pm_opp_put_opp_table(gpd->opp_table);
|
||||
dev_pm_opp_of_remove_table(&gpd->dev);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user