Re: [PATCH v2 08/10] lis3: Sysfs entry for setting chip measurementrate

[Ãric Piel]

Op 10-11-09 13:41, Samu Onkalo schreef:
> It is possible to read position information at the chip measurement
> rate via sysfs. This patch adds possibility to configure chip
> measurement rate.
Looks fine in general... but there is a bug, cf below.

In addition, the construct of the code make me cry for object
orientation. I'll get over it, but we should keep in mind that cleaning
this up would be welcome (maybe through the usage of an additional
function pointer in the lis3lv02 struct).

Eric

> 
> Signed-off-by: Samu Onkalo <samu.p.onkalo@xxxxxxxxx>
> ---
>  drivers/hwmon/lis3lv02d.c |   49 ++++++++++++++++++++++++++++++++++++++++++++-
>  1 files changed, 48 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/hwmon/lis3lv02d.c b/drivers/hwmon/lis3lv02d.c
> index 5b39257..be2eb97 100644
> --- a/drivers/hwmon/lis3lv02d.c
> +++ b/drivers/hwmon/lis3lv02d.c
> @@ -133,6 +133,37 @@ static int lis3lv02d_get_odr(void)
>  	return val;
>  }
>  
> +static int lis3lv02d_set_odr(int rate)
> +{
> +	u8 ctrl;
> +	int i, len, shift;
> +	int *rates;
> +	int ret = -EINVAL;
> +
> +	lis3_dev.read(&lis3_dev, CTRL_REG1, &ctrl);
> +
> +	if (lis3_dev.whoami == WAI_12B) {
> +		len = sizeof(lis3_12_rates);
ARRAY_SIZE() would be much more correct!

> +		rates = lis3_12_rates;
> +		shift = 4;
> +		ctrl &= ~(CTRL1_DF0 | CTRL1_DF1);
> +	} else {
> +		len = sizeof(lis3_8_rates);
idem

> +		rates = lis3_8_rates;
> +		shift = 7;
> +		ctrl &= ~CTRL1_DR;
> +	}
> +
> +	for (i = 0; i < len; i++)
> +		if (rates[i] == rate) {
> +			lis3_dev.write(&lis3_dev,
> +				CTRL_REG1, ctrl | (i << shift));
> +			ret = 0;
You could do simply a "return 0"

> +			break;
> +		}
> +	return ret;
And here a "return -EINVAL"


> +}
> +
>  static int lis3lv02d_selftest(struct lis3lv02d *lis3, s16 results[3])
>  {
>  	u8 reg;
> @@ -427,9 +458,25 @@ static ssize_t lis3lv02d_rate_show(struct device *dev,
>  	return sprintf(buf, "%d\n", lis3lv02d_get_odr());
>  }
>  
> +static ssize_t lis3lv02d_rate_set(struct device *dev,
> +				struct device_attribute *attr, const char *buf,
> +				size_t count)
> +{
> +	unsigned long rate;
> +
> +	if (strict_strtoul(buf, 0, &rate))
> +		return -EINVAL;
> +
> +	if (lis3lv02d_set_odr(rate))
> +		return -EINVAL;
> +
> +	return count;
> +}
> +
>  static DEVICE_ATTR(selftest, S_IRUGO, lis3lv02d_selftest_show, NULL);
>  static DEVICE_ATTR(position, S_IRUGO, lis3lv02d_position_show, NULL);
> -static DEVICE_ATTR(rate, S_IRUGO, lis3lv02d_rate_show, NULL);
> +static DEVICE_ATTR(rate, S_IRUGO | S_IWUSR, lis3lv02d_rate_show,
> +					    lis3lv02d_rate_set);
>  
>  static struct attribute *lis3lv02d_attributes[] = {
>  	&dev_attr_selftest.attr,

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/