I2C-Octeon: Use common error handling code in octeon_i2c_probe()

Message ID 73affb84-9cdd-9f5c-b96a-5a392739e789@users.sourceforge.net
State New
Headers show
Series
  • I2C-Octeon: Use common error handling code in octeon_i2c_probe()
Related show

Commit Message

SF Markus Elfring Oct. 25, 2017, 9:52 a.m.
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 25 Oct 2017 11:45:48 +0200

Add a jump target so that a specific error message is stored only once
at the end of this function implementation.
Replace two calls of the function "dev_err" by goto statements.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/i2c/busses/i2c-octeon-platdrv.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Comments

David Daney Oct. 25, 2017, 3:52 p.m. | #1
On 10/25/2017 02:52 AM, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>

NAK.  We don't need any more Markus Elfring spam.


> Date: Wed, 25 Oct 2017 11:45:48 +0200
> 
> Add a jump target so that a specific error message is stored only once
> at the end of this function implementation.

Please read C standard about duplicate literal strings to see why this 
is a completely misleading and false statement.


> Replace two calls of the function "dev_err" by goto statements.
> 
> This issue was detected by using the Coccinelle software.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
>   drivers/i2c/busses/i2c-octeon-platdrv.c | 14 ++++++--------
>   1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-octeon-platdrv.c b/drivers/i2c/busses/i2c-octeon-platdrv.c
> index 64bda83e65ac..ac8a1099c523 100644
> --- a/drivers/i2c/busses/i2c-octeon-platdrv.c
> +++ b/drivers/i2c/busses/i2c-octeon-platdrv.c
> @@ -207,10 +207,8 @@ static int octeon_i2c_probe(struct platform_device *pdev)
>   		result = devm_request_irq(&pdev->dev, i2c->hlc_irq,
>   					  octeon_i2c_hlc_isr78, 0,
>   					  DRV_NAME, i2c);
> -		if (result < 0) {
> -			dev_err(i2c->dev, "failed to attach interrupt\n");
> -			goto out;
> -		}
> +		if (result < 0)
> +			goto report_failure;
>   	} else {
>   		i2c->int_enable = octeon_i2c_int_enable;
>   		i2c->int_disable = octeon_i2c_int_disable;
> @@ -220,10 +218,8 @@ static int octeon_i2c_probe(struct platform_device *pdev)
>   
>   	result = devm_request_irq(&pdev->dev, i2c->irq,
>   				  octeon_i2c_isr, 0, DRV_NAME, i2c);
> -	if (result < 0) {
> -		dev_err(i2c->dev, "failed to attach interrupt\n");
> -		goto out;
> -	}
> +	if (result < 0)
> +		goto report_failure;
>   
>   	if (OCTEON_IS_MODEL(OCTEON_CN38XX))
>   		i2c->broken_irq_check = true;
> @@ -251,6 +247,8 @@ static int octeon_i2c_probe(struct platform_device *pdev)
>   	dev_info(i2c->dev, "probed\n");
>   	return 0;
>   
> +report_failure:
> +	dev_err(i2c->dev, "failed to attach interrupt\n");
>   out:
>   	return result;
>   };
>
SF Markus Elfring Oct. 26, 2017, 5 a.m. | #2
> NAK.  We don't need any more Markus Elfring spam.

Why do you not like another update suggestion for this use case?


>> Add a jump target so that a specific error message is stored only once
>> at the end of this function implementation.
> 
> Please read C standard about duplicate literal strings to see
> why this is a completely misleading and false statement.

* I proposed to adjust the position for one function call, didn't I?

* Do you care for a bit of code reduction?

* Do you prefer to use an optimisation option like “-fmerge-constants”
  (instead of integrating the shown small change)?

Regards,
Markus

Patch

diff --git a/drivers/i2c/busses/i2c-octeon-platdrv.c b/drivers/i2c/busses/i2c-octeon-platdrv.c
index 64bda83e65ac..ac8a1099c523 100644
--- a/drivers/i2c/busses/i2c-octeon-platdrv.c
+++ b/drivers/i2c/busses/i2c-octeon-platdrv.c
@@ -207,10 +207,8 @@  static int octeon_i2c_probe(struct platform_device *pdev)
 		result = devm_request_irq(&pdev->dev, i2c->hlc_irq,
 					  octeon_i2c_hlc_isr78, 0,
 					  DRV_NAME, i2c);
-		if (result < 0) {
-			dev_err(i2c->dev, "failed to attach interrupt\n");
-			goto out;
-		}
+		if (result < 0)
+			goto report_failure;
 	} else {
 		i2c->int_enable = octeon_i2c_int_enable;
 		i2c->int_disable = octeon_i2c_int_disable;
@@ -220,10 +218,8 @@  static int octeon_i2c_probe(struct platform_device *pdev)
 
 	result = devm_request_irq(&pdev->dev, i2c->irq,
 				  octeon_i2c_isr, 0, DRV_NAME, i2c);
-	if (result < 0) {
-		dev_err(i2c->dev, "failed to attach interrupt\n");
-		goto out;
-	}
+	if (result < 0)
+		goto report_failure;
 
 	if (OCTEON_IS_MODEL(OCTEON_CN38XX))
 		i2c->broken_irq_check = true;
@@ -251,6 +247,8 @@  static int octeon_i2c_probe(struct platform_device *pdev)
 	dev_info(i2c->dev, "probed\n");
 	return 0;
 
+report_failure:
+	dev_err(i2c->dev, "failed to attach interrupt\n");
 out:
 	return result;
 };