[PATCH v3 3/3] pmdomain: rockchip: use dev_err_probe() for the other probe errors

From: Arun Iyengar via B4 Relay

Date: Fri Nov 13 2026 - 07:16:49 EST


From: Arun Iyengar <aiyengar1990@xxxxxxxxx>

Convert the remaining dev_err() and return pairs in the probe path to
dev_err_probe(). The return values do not change.

Signed-off-by: Arun Iyengar <aiyengar1990@xxxxxxxxx>
---
drivers/pmdomain/rockchip/pm-domains.c | 63 ++++++++++++++--------------------
1 file changed, 26 insertions(+), 37 deletions(-)

diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c
index a0b47d8c4b2a..d132fdd11a56 100644
--- a/drivers/pmdomain/rockchip/pm-domains.c
+++ b/drivers/pmdomain/rockchip/pm-domains.c
@@ -804,28 +804,22 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,
int error;

error = of_property_read_u32(node, "reg", &id);
- if (error) {
- dev_err(pmu->dev,
- "%pOFn: failed to retrieve domain id (reg): %d\n",
- node, error);
- return -EINVAL;
- }
-
- if (id >= pmu->info->num_domains) {
- dev_err(pmu->dev, "%pOFn: invalid domain id %d\n",
- node, id);
- return -EINVAL;
- }
+ if (error)
+ return dev_err_probe(pmu->dev, -EINVAL,
+ "%pOFn: failed to retrieve domain id (reg)\n",
+ node);
+
+ if (id >= pmu->info->num_domains)
+ return dev_err_probe(pmu->dev, -EINVAL,
+ "%pOFn: invalid domain id %d\n", node, id);
/* RK3588 has domains with two parents (RKVDEC0/RKVDEC1) */
if (pmu->genpd_data.domains[id])
return 0;

pd_info = &pmu->info->domain_info[id];
- if (!pd_info->pwr_mask && !pd_info->req_mask) {
- dev_err(pmu->dev, "%pOFn: undefined domain id %d\n",
- node, id);
- return -EINVAL;
- }
+ if (!pd_info->pwr_mask && !pd_info->req_mask)
+ return dev_err_probe(pmu->dev, -EINVAL,
+ "%pOFn: undefined domain id %d\n", node, id);

pd = devm_kzalloc_obj(pmu->dev, *pd);
if (!pd)
@@ -1033,12 +1027,10 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu,
u32 idx;

error = of_property_read_u32(parent, "reg", &idx);
- if (error) {
- dev_err(pmu->dev,
- "%pOFn: failed to retrieve domain id (reg): %d\n",
- parent, error);
- return error;
- }
+ if (error)
+ return dev_err_probe(pmu->dev, error,
+ "%pOFn: failed to retrieve domain id (reg)\n",
+ parent);
parent_domain = pmu->genpd_data.domains[idx];

error = rockchip_pm_add_one_domain(pmu, np);
@@ -1046,23 +1038,20 @@ static int rockchip_pm_add_subdomain(struct rockchip_pmu *pmu,
return error;

error = of_property_read_u32(np, "reg", &idx);
- if (error) {
- dev_err(pmu->dev,
- "%pOFn: failed to retrieve domain id (reg): %d\n",
- np, error);
- return error;
- }
+ if (error)
+ return dev_err_probe(pmu->dev, error,
+ "%pOFn: failed to retrieve domain id (reg)\n",
+ np);
child_domain = pmu->genpd_data.domains[idx];

error = pm_genpd_add_subdomain(parent_domain, child_domain);
- if (error) {
- dev_err(pmu->dev, "%s failed to add subdomain %s: %d\n",
- parent_domain->name, child_domain->name, error);
- return error;
- } else {
- dev_dbg(pmu->dev, "%s add subdomain: %s\n",
- parent_domain->name, child_domain->name);
- }
+ if (error)
+ return dev_err_probe(pmu->dev, error,
+ "%s failed to add subdomain %s\n",
+ parent_domain->name, child_domain->name);
+
+ dev_dbg(pmu->dev, "%s add subdomain: %s\n",
+ parent_domain->name, child_domain->name);

error = rockchip_pm_add_subdomain(pmu, np);
if (error)

--
2.55.0