Thread (41 messages) 41 messages, 7 authors, 2021-05-03

Re: [PATCH 01/16] soc: imx: gpcv2: move to more ideomatic error handling in probe

From: Frieder Schrempf <hidden>
Date: 2021-05-03 13:27:02
Also in: linux-devicetree, lkml

On 29.04.21 09:30, Peng Fan (OSS) wrote:
From: Lucas Stach <l.stach@pengutronix.de>

Switch to "goto out..." error handling in domain driver probe to
avoid repeating all the error paths.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Marek Vasut <marex@denx.de>
Tested-by: Adam Ford <redacted>
Reviewed-by: Frieder Schrempf <redacted>
quoted hunk ↗ jump to hunk
---
  drivers/soc/imx/gpcv2.c | 13 +++++++++----
  1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c
index db7e7fc321b1..512e6f4acafd 100644
--- a/drivers/soc/imx/gpcv2.c
+++ b/drivers/soc/imx/gpcv2.c
@@ -502,18 +502,23 @@ static int imx_pgc_domain_probe(struct platform_device *pdev)
  	ret = pm_genpd_init(&domain->genpd, NULL, true);
  	if (ret) {
  		dev_err(domain->dev, "Failed to init power domain\n");
-		imx_pgc_put_clocks(domain);
-		return ret;
+		goto out_put_clocks;
  	}
  
  	ret = of_genpd_add_provider_simple(domain->dev->of_node,
  					   &domain->genpd);
  	if (ret) {
  		dev_err(domain->dev, "Failed to add genpd provider\n");
-		pm_genpd_remove(&domain->genpd);
-		imx_pgc_put_clocks(domain);
+		goto out_genpd_remove;
  	}
  
+	return 0;
+
+out_genpd_remove:
+	pm_genpd_remove(&domain->genpd);
+out_put_clocks:
+	imx_pgc_put_clocks(domain);
+
  	return ret;
  }
  
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help