diff mbox

hwmon/amc6821: Use common error handling code in amc6821_init_client()

Message ID 8cc80503-aa2b-bb5e-ab40-fa31b401b6a2@users.sourceforge.net (mailing list archive)
State Rejected
Headers show

Commit Message

SF Markus Elfring Oct. 24, 2017, 8:10 p.m. UTC 
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 24 Oct 2017 22:04:20 +0200

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

  This issue was detected by using the Coccinelle software.

* Delete the local variable "err" which became unnecessary
  with this refactoring.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/hwmon/amc6821.c | 77 ++++++++++++++++++-------------------------------
 1 file changed, 28 insertions(+), 49 deletions(-)

Comments

Guenter Roeck Oct. 24, 2017, 8:18 p.m. UTC | #1 
On Tue, Oct 24, 2017 at 10:10:13PM +0200, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 24 Oct 2017 22:04:20 +0200
> 
> * Add two jump targets so that a bit of exception handling can be better
>   reused at the end of this function.
> 
>   This issue was detected by using the Coccinelle software.
> 
> * Delete the local variable "err" which became unnecessary
>   with this refactoring.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Nack; I am not a friend of that much verboseness to start with,
and I don't think the patch improves readability.

Guenter

> ---
>  drivers/hwmon/amc6821.c | 77 ++++++++++++++++++-------------------------------
>  1 file changed, 28 insertions(+), 49 deletions(-)
> 
> diff --git a/drivers/hwmon/amc6821.c b/drivers/hwmon/amc6821.c
> index 46b4e35fd555..5c067de3fdcf 100644
> --- a/drivers/hwmon/amc6821.c
> +++ b/drivers/hwmon/amc6821.c
> @@ -885,70 +885,42 @@ static int amc6821_detect(
>  static int amc6821_init_client(struct i2c_client *client)
>  {
>  	int config;
> -	int err = -EIO;
>  
>  	if (init) {
>  		config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF4);
> -
> -		if (config < 0) {
> -				dev_err(&client->dev,
> -			"Error reading configuration register, aborting.\n");
> -				return err;
> -		}
> +		if (config < 0)
> +			goto report_read_failure;
>  
>  		config |= AMC6821_CONF4_MODE;
> -
>  		if (i2c_smbus_write_byte_data(client, AMC6821_REG_CONF4,
> -				config)) {
> -			dev_err(&client->dev,
> -			"Configuration register write error, aborting.\n");
> -			return err;
> -		}
> +					      config))
> +			goto report_write_failure;
>  
>  		config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF3);
> -
> -		if (config < 0) {
> -			dev_err(&client->dev,
> -			"Error reading configuration register, aborting.\n");
> -			return err;
> -		}
> +		if (config < 0)
> +			goto report_read_failure;
>  
>  		dev_info(&client->dev, "Revision %d\n", config & 0x0f);
>  
>  		config &= ~AMC6821_CONF3_THERM_FAN_EN;
> -
>  		if (i2c_smbus_write_byte_data(client, AMC6821_REG_CONF3,
> -				config)) {
> -			dev_err(&client->dev,
> -			"Configuration register write error, aborting.\n");
> -			return err;
> -		}
> +					      config))
> +			goto report_write_failure;
>  
>  		config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF2);
> -
> -		if (config < 0) {
> -			dev_err(&client->dev,
> -			"Error reading configuration register, aborting.\n");
> -			return err;
> -		}
> +		if (config < 0)
> +			goto report_read_failure;
>  
>  		config &= ~AMC6821_CONF2_RTFIE;
>  		config &= ~AMC6821_CONF2_LTOIE;
>  		config &= ~AMC6821_CONF2_RTOIE;
> -		if (i2c_smbus_write_byte_data(client,
> -				AMC6821_REG_CONF2, config)) {
> -			dev_err(&client->dev,
> -			"Configuration register write error, aborting.\n");
> -			return err;
> -		}
> +		if (i2c_smbus_write_byte_data(client, AMC6821_REG_CONF2,
> +					      config))
> +			goto report_write_failure;
>  
>  		config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF1);
> -
> -		if (config < 0) {
> -			dev_err(&client->dev,
> -			"Error reading configuration register, aborting.\n");
> -			return err;
> -		}
> +		if (config < 0)
> +			goto report_read_failure;
>  
>  		config &= ~AMC6821_CONF1_THERMOVIE;
>  		config &= ~AMC6821_CONF1_FANIE;
> @@ -958,14 +930,21 @@ static int amc6821_init_client(struct i2c_client *client)
>  		else
>  			config &= ~AMC6821_CONF1_PWMINV;
>  
> -		if (i2c_smbus_write_byte_data(
> -				client, AMC6821_REG_CONF1, config)) {
> -			dev_err(&client->dev,
> -			"Configuration register write error, aborting.\n");
> -			return err;
> -		}
> +		if (i2c_smbus_write_byte_data(client, AMC6821_REG_CONF1,
> +					      config))
> +			goto report_write_failure;
>  	}
>  	return 0;
> +
> +report_read_failure:
> +	dev_err(&client->dev,
> +		"Error reading configuration register, aborting.\n");
> +	return -EIO;
> +
> +report_write_failure:
> +	dev_err(&client->dev,
> +		"Configuration register write error, aborting.\n");
> +	return -EIO;
>  }
>  
>  static int amc6821_probe(struct i2c_client *client,
> -- 
> 2.14.3
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
SF Markus Elfring Oct. 25, 2017, 6:03 a.m. UTC | #2 
> Nack; I am not a friend of that much verboseness to start with,
> and I don't think the patch improves readability.

* Do you care to avoid code duplication for two error messages in this use case?

* How do you think about to return a single error code directly
  without using an intermediate variable?

Regards,
Markus
--
To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/hwmon/amc6821.c b/drivers/hwmon/amc6821.c
index 46b4e35fd555..5c067de3fdcf 100644
--- a/drivers/hwmon/amc6821.c
+++ b/drivers/hwmon/amc6821.c
@@ -885,70 +885,42 @@  static int amc6821_detect(
 static int amc6821_init_client(struct i2c_client *client)
 {
 	int config;
-	int err = -EIO;
 
 	if (init) {
 		config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF4);
-
-		if (config < 0) {
-				dev_err(&client->dev,
-			"Error reading configuration register, aborting.\n");
-				return err;
-		}
+		if (config < 0)
+			goto report_read_failure;
 
 		config |= AMC6821_CONF4_MODE;
-
 		if (i2c_smbus_write_byte_data(client, AMC6821_REG_CONF4,
-				config)) {
-			dev_err(&client->dev,
-			"Configuration register write error, aborting.\n");
-			return err;
-		}
+					      config))
+			goto report_write_failure;
 
 		config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF3);
-
-		if (config < 0) {
-			dev_err(&client->dev,
-			"Error reading configuration register, aborting.\n");
-			return err;
-		}
+		if (config < 0)
+			goto report_read_failure;
 
 		dev_info(&client->dev, "Revision %d\n", config & 0x0f);
 
 		config &= ~AMC6821_CONF3_THERM_FAN_EN;
-
 		if (i2c_smbus_write_byte_data(client, AMC6821_REG_CONF3,
-				config)) {
-			dev_err(&client->dev,
-			"Configuration register write error, aborting.\n");
-			return err;
-		}
+					      config))
+			goto report_write_failure;
 
 		config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF2);
-
-		if (config < 0) {
-			dev_err(&client->dev,
-			"Error reading configuration register, aborting.\n");
-			return err;
-		}
+		if (config < 0)
+			goto report_read_failure;
 
 		config &= ~AMC6821_CONF2_RTFIE;
 		config &= ~AMC6821_CONF2_LTOIE;
 		config &= ~AMC6821_CONF2_RTOIE;
-		if (i2c_smbus_write_byte_data(client,
-				AMC6821_REG_CONF2, config)) {
-			dev_err(&client->dev,
-			"Configuration register write error, aborting.\n");
-			return err;
-		}
+		if (i2c_smbus_write_byte_data(client, AMC6821_REG_CONF2,
+					      config))
+			goto report_write_failure;
 
 		config = i2c_smbus_read_byte_data(client, AMC6821_REG_CONF1);
-
-		if (config < 0) {
-			dev_err(&client->dev,
-			"Error reading configuration register, aborting.\n");
-			return err;
-		}
+		if (config < 0)
+			goto report_read_failure;
 
 		config &= ~AMC6821_CONF1_THERMOVIE;
 		config &= ~AMC6821_CONF1_FANIE;
@@ -958,14 +930,21 @@  static int amc6821_init_client(struct i2c_client *client)
 		else
 			config &= ~AMC6821_CONF1_PWMINV;
 
-		if (i2c_smbus_write_byte_data(
-				client, AMC6821_REG_CONF1, config)) {
-			dev_err(&client->dev,
-			"Configuration register write error, aborting.\n");
-			return err;
-		}
+		if (i2c_smbus_write_byte_data(client, AMC6821_REG_CONF1,
+					      config))
+			goto report_write_failure;
 	}
 	return 0;
+
+report_read_failure:
+	dev_err(&client->dev,
+		"Error reading configuration register, aborting.\n");
+	return -EIO;
+
+report_write_failure:
+	dev_err(&client->dev,
+		"Configuration register write error, aborting.\n");
+	return -EIO;
 }
 
 static int amc6821_probe(struct i2c_client *client,