Skip to contentSkip to conversation

pwm: sti: Avoid conditional gotos

PATCH In review Thierry Reding 3 participants 6 messages Nov 11, 2020 – Nov 12, 2020 PWM

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 pwm: sti: Avoid conditional gotos

Using gotos for conditional code complicates this code significantly. Convert the code to simple conditional blocks to increase readability.

---
 drivers/pwm/pwm-sti.c | 53 ++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 29 deletions(-)
drivers/pwm/pwm-sti.c +24 -29
index a1392255955f..c6c82724d327 100644
@@ -590,48 +590,43 @@ static int sti_pwm_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	if (!cdata->pwm_num_devs)
-		goto skip_pwm;
-
-	pc->pwm_clk = of_clk_get_by_name(dev->of_node, "pwm");
-	if (IS_ERR(pc->pwm_clk)) {
-		dev_err(dev, "failed to get PWM clock\n");
-		return PTR_ERR(pc->pwm_clk);
-	}
+	if (cdata->pwm_num_devs) {
+		pc->pwm_clk = of_clk_get_by_name(dev->of_node, "pwm");
+		if (IS_ERR(pc->pwm_clk)) {
+			dev_err(dev, "failed to get PWM clock\n");
+			return PTR_ERR(pc->pwm_clk);
+		}
 
-	ret = clk_prepare(pc->pwm_clk);
-	if (ret) {
-		dev_err(dev, "failed to prepare clock\n");
-		goto put_pwm_clk;
+		ret = clk_prepare(pc->pwm_clk);
+		if (ret) {
+			dev_err(dev, "failed to prepare clock\n");
+			goto put_pwm_clk;
+		}
 	}
 
-skip_pwm:
-	if (!cdata->cpt_num_devs)
-		goto skip_cpt;
-
-	pc->cpt_clk = of_clk_get_by_name(dev->of_node, "capture");
-	if (IS_ERR(pc->cpt_clk)) {
-		dev_err(dev, "failed to get PWM capture clock\n");
-		ret = PTR_ERR(pc->cpt_clk);
-		goto unprepare_pwm_clk;
-	}
+	if (cdata->cpt_num_devs) {
+		pc->cpt_clk = of_clk_get_by_name(dev->of_node, "capture");
+		if (IS_ERR(pc->cpt_clk)) {
+			dev_err(dev, "failed to get PWM capture clock\n");
+			ret = PTR_ERR(pc->cpt_clk);
+			goto unprepare_pwm_clk;
+		}
 
-	ret = clk_prepare(pc->cpt_clk);
-	if (ret) {
-		dev_err(dev, "failed to prepare clock\n");
-		goto put_cpt_clk;
+		ret = clk_prepare(pc->cpt_clk);
+		if (ret) {
+			dev_err(dev, "failed to prepare clock\n");
+			goto put_cpt_clk;
+		}
 	}
 
-skip_cpt:
 	pc->chip.dev = dev;
 	pc->chip.ops = &sti_pwm_ops;
 	pc->chip.base = -1;
 	pc->chip.npwm = pc->cdata->pwm_num_devs;
 
 	ret = pwmchip_add(&pc->chip);
-	if (ret < 0) {
+	if (ret < 0)
 		goto unprepare_cpt_clk;
-	}
 
 	for (i = 0; i < cdata->cpt_num_devs; i++) {
 		struct sti_cpt_ddata *ddata;
Signature · 1 line
2.29.2
#1 lore raw

PATCH 2/2 pwm: sti: Remove unnecessary blank line

A single blank line is enough to separate logical code blocks.

---
 drivers/pwm/pwm-sti.c | 1 -
 1 file changed, 1 deletion(-)
drivers/pwm/pwm-sti.c +0 -1
index c6c82724d327..ec667b31d7ec 100644
@@ -505,7 +505,6 @@ static int sti_pwm_probe_dt(struct sti_pwm_chip *pc)
 	if (IS_ERR(pc->prescale_high))
 		return PTR_ERR(pc->prescale_high);
 
-
 	pc->pwm_out_en = devm_regmap_field_alloc(dev, pc->regmap,
 						 reg_fields[PWM_OUT_EN]);
 	if (IS_ERR(pc->pwm_out_en))
Signature · 1 line
2.29.2
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] pwm: sti: Remove unnecessary blank line

Quoted 6 lines · Thierry Reding

A single blank line is enough to separate logical code blocks.

---
 drivers/pwm/pwm-sti.c | 1 -
 1 file changed, 1 deletion(-)
Signature · 4 lines
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
Acked-by on v1 2/2
#3 lore raw

Re: [PATCH 2/2] pwm: sti: Remove unnecessary blank line

In reply to Thierry Reding

[dropped Ajit Pal Singh from Cc:]

Quoted 3 lines · Thierry Reding

A single blank line is enough to separate logical code blocks.

I would consider this too minor to create a patch for, but as you already invested the time:

Thanks
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |
Acked-by on v1 1/2
#4 lore raw
In reply to Thierry Reding

Hello Thierry,

Quoted 5 lines · Thierry Reding

Using gotos for conditional code complicates this code significantly. Convert the code to simple conditional blocks to increase readability.

Great you picked that up, thanks.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |
Acked-by on v1 1/2
#5 lore raw
In reply to Thierry Reding
Quoted 73 lines · Thierry Reding

Using gotos for conditional code complicates this code significantly. Convert the code to simple conditional blocks to increase readability.

---
 drivers/pwm/pwm-sti.c | 53 ++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 29 deletions(-)
drivers/pwm/pwm-sti.c +23 -27
index a1392255955f..c6c82724d327 100644
@@ -590,48 +590,43 @@ static int sti_pwm_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	if (!cdata->pwm_num_devs)
-		goto skip_pwm;
-
-	pc->pwm_clk = of_clk_get_by_name(dev->of_node, "pwm");
-	if (IS_ERR(pc->pwm_clk)) {
-		dev_err(dev, "failed to get PWM clock\n");
-		return PTR_ERR(pc->pwm_clk);
-	}
+	if (cdata->pwm_num_devs) {
+		pc->pwm_clk = of_clk_get_by_name(dev->of_node, "pwm");
+		if (IS_ERR(pc->pwm_clk)) {
+			dev_err(dev, "failed to get PWM clock\n");
+			return PTR_ERR(pc->pwm_clk);
+		}
 
-	ret = clk_prepare(pc->pwm_clk);
-	if (ret) {
-		dev_err(dev, "failed to prepare clock\n");
-		goto put_pwm_clk;
+		ret = clk_prepare(pc->pwm_clk);
+		if (ret) {
+			dev_err(dev, "failed to prepare clock\n");
+			goto put_pwm_clk;
+		}
 	}
 
-skip_pwm:
-	if (!cdata->cpt_num_devs)
-		goto skip_cpt;
-
-	pc->cpt_clk = of_clk_get_by_name(dev->of_node, "capture");
-	if (IS_ERR(pc->cpt_clk)) {
-		dev_err(dev, "failed to get PWM capture clock\n");
-		ret = PTR_ERR(pc->cpt_clk);
-		goto unprepare_pwm_clk;
-	}
+	if (cdata->cpt_num_devs) {
+		pc->cpt_clk = of_clk_get_by_name(dev->of_node, "capture");
+		if (IS_ERR(pc->cpt_clk)) {
+			dev_err(dev, "failed to get PWM capture clock\n");
+			ret = PTR_ERR(pc->cpt_clk);
+			goto unprepare_pwm_clk;
+		}
 
-	ret = clk_prepare(pc->cpt_clk);
-	if (ret) {
-		dev_err(dev, "failed to prepare clock\n");
-		goto put_cpt_clk;
+		ret = clk_prepare(pc->cpt_clk);
+		if (ret) {
+			dev_err(dev, "failed to prepare clock\n");
+			goto put_cpt_clk;
+		}
 	}
 
-skip_cpt:

drivers/pwm/pwm-sti.c static int sti_pwm_probe(struct platform_device *pdev) · line 634

Quoted 10 lines
drivers/pwm/pwm-sti.c +1 -2
 	pc->chip.dev = dev;
 	pc->chip.ops = &sti_pwm_ops;
 	pc->chip.base = -1;
 	pc->chip.npwm = pc->cdata->pwm_num_devs;
 
 	ret = pwmchip_add(&pc->chip);
-	if (ret < 0) {
+	if (ret < 0)
 		goto unprepare_cpt_clk;
-	}

Sneaky!

Signature · 4 lines
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog