tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clk: qcom: gdsc: Capture pm_genpd_add_subdomain result code

Browse Source 
commit 65a733464553ea192797b889d1533a1a37216f32 upstream.

Adding a new clause to this if/else I noticed the existing usage of
pm_genpd_add_subdomain() wasn't capturing and returning the result code.

pm_genpd_add_subdomain() returns an int and can fail. Capture that result
code and throw it up the call stack if something goes wrong.

Fixes: 1b771839de ("clk: qcom: gdsc: enable optional power domain support")
Cc: stable@vger.kernel.org
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Link: https://lore.kernel.org/r/20250117-b4-linux-next-24-11-18-clock-multiple-power-domains-v10-2-13f2bb656dad@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bryan O'Donoghue
2025-01-17 13:54:08 +00:00
committed by Greg Kroah-Hartman
parent 12ef07c4bf
commit 4d6fb2a43f
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/clk/qcom/gdsc.c
+27 -13
View File
@@ -506,6 +506,23 @@ err_disable_supply:
return ret; return ret;
} }
static void gdsc_pm_subdomain_remove(struct gdsc_desc *desc, size_t num)
{
struct device *dev = desc->dev;
struct gdsc **scs = desc->scs;
int i;
/* Remove subdomains */
for (i = num - 1; i >= 0; i--) {
if (!scs[i])
continue;
if (scs[i]->parent)
pm_genpd_remove_subdomain(scs[i]->parent, &scs[i]->pd);
else if (!IS_ERR_OR_NULL(dev->pm_domain))
pm_genpd_remove_subdomain(pd_to_genpd(dev->pm_domain), &scs[i]->pd);
}
}
int gdsc_register(struct gdsc_desc *desc, int gdsc_register(struct gdsc_desc *desc,
struct reset_controller_dev *rcdev, struct regmap *regmap) struct reset_controller_dev *rcdev, struct regmap *regmap)
{ {
@@ -555,30 +572,27 @@ int gdsc_register(struct gdsc_desc *desc,
if (!scs[i]) if (!scs[i])
continue; continue;
if (scs[i]->parent) if (scs[i]->parent)
pm_genpd_add_subdomain(scs[i]->parent, &scs[i]->pd); ret = pm_genpd_add_subdomain(scs[i]->parent, &scs[i]->pd);
else if (!IS_ERR_OR_NULL(dev->pm_domain)) else if (!IS_ERR_OR_NULL(dev->pm_domain))
pm_genpd_add_subdomain(pd_to_genpd(dev->pm_domain), &scs[i]->pd); ret = pm_genpd_add_subdomain(pd_to_genpd(dev->pm_domain), &scs[i]->pd);
if (ret)
goto err_pm_subdomain_remove;
} }
return of_genpd_add_provider_onecell(dev->of_node, data); return of_genpd_add_provider_onecell(dev->of_node, data);
err_pm_subdomain_remove:
gdsc_pm_subdomain_remove(desc, i);
return ret;
} }
void gdsc_unregister(struct gdsc_desc *desc) void gdsc_unregister(struct gdsc_desc *desc)
{ {
int i;
struct device *dev = desc->dev; struct device *dev = desc->dev;
struct gdsc **scs = desc->scs;
size_t num = desc->num; size_t num = desc->num;
/* Remove subdomains */ gdsc_pm_subdomain_remove(desc, num);
for (i = num - 1; i >= 0; i--) {
if (!scs[i])
continue;
if (scs[i]->parent)
pm_genpd_remove_subdomain(scs[i]->parent, &scs[i]->pd);
else if (!IS_ERR_OR_NULL(dev->pm_domain))
pm_genpd_remove_subdomain(pd_to_genpd(dev->pm_domain), &scs[i]->pd);
}
of_genpd_del_provider(dev->of_node); of_genpd_del_provider(dev->of_node);
} }