pmdomain: ti: Use common error handling code in ti_sci_pm_domain_probe()

Commit Message

Markus Elfring Nov. 5, 2023, 2:52 p.m. UTC

From: Markus Elfring <[e-mail]>
Date: Sun, 5 Nov 2023 15:30:28 +0100

Add a jump target so that a bit of exception handling can be better
reused at the end of this function.

Signed-off-by: Markus Elfring <[e-mail]>
---
 drivers/pmdomain/ti/ti_sci_pm_domains.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--
2.42.0

Patch

diff --git a/drivers/pmdomain/ti/ti_sci_pm_domains.c b/drivers/pmdomain/ti/ti_sci_pm_domains.c
index c091d569ecd5..af8a1ed2db70 100644
--- a/drivers/pmdomain/ti/ti_sci_pm_domains.c
+++ b/drivers/pmdomain/ti/ti_sci_pm_domains.c
@@ -153,18 +153,14 @@  static int ti_sci_pm_domain_probe(struct platform_device *pdev)
 					max_id = args.args[0];

 				pd = devm_kzalloc(dev, sizeof(*pd), GFP_KERNEL);
-				if (!pd) {
-					of_node_put(np);
-					return -ENOMEM;
-				}
+				if (!pd)
+					goto put_node;

 				pd->pd.name = devm_kasprintf(dev, GFP_KERNEL,
 							     "pd:%d",
 							     args.args[0]);
-				if (!pd->pd.name) {
-					of_node_put(np);
-					return -ENOMEM;
-				}
+				if (!pd->pd.name)
+					goto put_node;

 				pd->pd.power_off = ti_sci_pd_power_off;
 				pd->pd.power_on = ti_sci_pd_power_on;
@@ -193,6 +189,10 @@  static int ti_sci_pm_domain_probe(struct platform_device *pdev)
 		pd_provider->data.domains[pd->idx] = &pd->pd;

 	return of_genpd_add_provider_onecell(dev->of_node, &pd_provider->data);
+
+put_node:
+	of_node_put(np);
+	return -ENOMEM;
 }

 static struct platform_driver ti_sci_pm_domains_driver = {