Re: [PATCH 04/79] hwmon: (lm87) Fix checkpatch issues

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, 23 Jan 2012 18:48:43 -0800, Guenter Roeck wrote:
> From: Guenter Roeck <linux@xxxxxxxxxxxx>
> 
> Fixed:
> ERROR: do not use assignment in if condition
> ERROR: space required after that close brace '}'
> ERROR: space required after that ',' (ctx:VxV)
> ERROR: spaces required around that '<' (ctx:VxV)
> ERROR: trailing statements should be on next line
> WARNING: line over 80 characters
> WARNING: simple_strtol is obsolete, use kstrtol instead
> WARNING: simple_strtoul is obsolete, use kstrtoul instead
> 
> Modify multi-line comments to follow Documentation/CodingStyle.
> 
> Not fixed everywhere (code complexity):
> ERROR: do not use assignment in if condition
> 
> Cc: Jean Delvare <khali@xxxxxxxxxxxx>
> Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
>  drivers/hwmon/lm87.c |  247 ++++++++++++++++++++++++++++++++++----------------
>  1 files changed, 170 insertions(+), 77 deletions(-)
> 
> diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
> index 126d0cc..8e66f99 100644
> --- a/drivers/hwmon/lm87.c
> +++ b/drivers/hwmon/lm87.c
> (...)
> -static void set_in_min(struct device *dev, const char *buf, int nr)
> +static ssize_t set_in_min(struct device *dev, const char *buf, int nr,
> +			  size_t count)
>  {
>  	struct i2c_client *client = to_i2c_client(dev);
>  	struct lm87_data *data = i2c_get_clientdata(client);
> -	long val = simple_strtol(buf, NULL, 10);
> +	long val;
> +	int err;
> +
> +	err = kstrtol(buf, 10, &val);
> +	if (err)
> +		return err;
>  
>  	mutex_lock(&data->update_lock);
>  	data->in_min[nr] = IN_TO_REG(val, data->in_scale[nr]);
> -	lm87_write_value(client, nr<6 ? LM87_REG_IN_MIN(nr) :
> -			 LM87_REG_AIN_MIN(nr-6), data->in_min[nr]);
> +	lm87_write_value(client, nr < 6 ? LM87_REG_IN_MIN(nr) :
> +			 LM87_REG_AIN_MIN(nr - 6), data->in_min[nr]);
>  	mutex_unlock(&data->update_lock);
> +	return count;
>  }

Here you are going beyond checkpatch or style fixes. I'm not saying
that this extra change is bad, but it certainly doesn't belong to this
patch. Same for the similar change to set_in_max(), set_temp_low(),
set_temp_high() and set_fan_min(). As I see you're sending this kind of
cleanup patch to Linus past rc1, you should really refrain from adding
any extra change.

As a side note, what this driver really needs is turning most
DEVICE_ATTR into SENSOR_DEVICE_ATTR to get rid of macro-generated stub
functions. This change is one small step in the right direction...

>  
> -static void set_in_max(struct device *dev, const char *buf, int nr)
> +static ssize_t set_in_max(struct device *dev, const char *buf, int nr,
> +			  size_t count)
>  {
>  	struct i2c_client *client = to_i2c_client(dev);
>  	struct lm87_data *data = i2c_get_clientdata(client);
> -	long val = simple_strtol(buf, NULL, 10);
> +	long val;
> +	int err;
> +
> +	err = kstrtol(buf, 10, &val);
> +	if (err)
> +		return err;
>  
>  	mutex_lock(&data->update_lock);
>  	data->in_max[nr] = IN_TO_REG(val, data->in_scale[nr]);
> -	lm87_write_value(client, nr<6 ? LM87_REG_IN_MAX(nr) :
> -			 LM87_REG_AIN_MAX(nr-6), data->in_max[nr]);
> +	lm87_write_value(client, nr < 6 ? LM87_REG_IN_MAX(nr) :
> +			 LM87_REG_AIN_MAX(nr - 6), data->in_max[nr]);
>  	mutex_unlock(&data->update_lock);
> +	return count;
>  }
>  
>  #define set_in(offset) \
> -static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute *attr, \
> +static ssize_t set_in##offset##_min(struct device *dev, \
> +				    struct device_attribute *attr, \
>  		const char *buf, size_t count) \
>  { \

Alignment looks quite bad now. Same for set_in##offset##_max,
set_temp##offset##_low, set_temp##offset##_high, set_fan##offset##_min
and set_fan##offset##_div.

-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@xxxxxxxxxxxxxx
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors


[Index of Archives]     [Linux Kernel]     [Linux Hardware Monitoring]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]

  Powered by Linux