2019-03-16 15:09:31

by Marcelo Schmitt

Subject: [PATCH v4 6/7] staging: iio: ad5933: change attributes to match ABI

Change device attributes' names to match ABI documentation. Names were
chosen such that they tend to be similar to existing ABI so it should
be easier to standardize them when necessary.

Signed-off-by: Marcelo Schmitt <[email protected]>
---
.../staging/iio/impedance-analyzer/ad5933.c | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index d75bdfbf93de..262415bc659d 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -315,12 +315,12 @@ static ssize_t ad5933_store_frequency(struct device *dev,
return ret ? ret : len;
}

-static IIO_DEVICE_ATTR(out_voltage0_freq_start, 0644,
+static IIO_DEVICE_ATTR(out_altvoltage0_frequency_start, 0644,
ad5933_show_frequency,
ad5933_store_frequency,
AD5933_REG_FREQ_START);

-static IIO_DEVICE_ATTR(out_voltage0_freq_increment, 0644,
+static IIO_DEVICE_ATTR(out_altvoltage0_frequency_increment, 0644,
ad5933_show_frequency,
ad5933_store_frequency,
AD5933_REG_FREQ_INC);
@@ -463,12 +463,12 @@ static IIO_DEVICE_ATTR(in_voltage0_scale_available, 0444,
NULL,
AD5933_IN_PGA_GAIN_AVAIL);

-static IIO_DEVICE_ATTR(out_voltage0_freq_points, 0644,
+static IIO_DEVICE_ATTR(out_altvoltage0_frequency_points, 0644,
ad5933_show,
ad5933_store,
AD5933_FREQ_POINTS);

-static IIO_DEVICE_ATTR(out_voltage0_settling_cycles, 0644,
+static IIO_DEVICE_ATTR(out_altvoltage0_settling_cycles, 0644,
ad5933_show,
ad5933_store,
AD5933_OUT_SETTLING_CYCLES);
@@ -480,12 +480,12 @@ static IIO_DEVICE_ATTR(out_voltage0_settling_cycles, 0644,
* don't create dedicated sysfs channel attributes for out0 and in0.
*/
static struct attribute *ad5933_attributes[] = {
- &iio_dev_attr_out_voltage0_scale.dev_attr.attr,
- &iio_dev_attr_out_voltage0_scale_available.dev_attr.attr,
- &iio_dev_attr_out_voltage0_freq_start.dev_attr.attr,
- &iio_dev_attr_out_voltage0_freq_increment.dev_attr.attr,
- &iio_dev_attr_out_voltage0_freq_points.dev_attr.attr,
- &iio_dev_attr_out_voltage0_settling_cycles.dev_attr.attr,
+ &iio_dev_attr_out_altvoltage0_raw.dev_attr.attr,
+ &iio_dev_attr_out_altvoltage0_scale_available.dev_attr.attr,
+ &iio_dev_attr_out_altvoltage0_frequency_start.dev_attr.attr,
+ &iio_dev_attr_out_altvoltage0_frequency_increment.dev_attr.attr,
+ &iio_dev_attr_out_altvoltage0_frequency_points.dev_attr.attr,
+ &iio_dev_attr_out_altvoltage0_settling_cycles.dev_attr.attr,
&iio_dev_attr_in_voltage0_scale.dev_attr.attr,
&iio_dev_attr_in_voltage0_scale_available.dev_attr.attr,
NULL
--
2.20.1

2019-03-16 18:44:04

by Jonathan Cameron

Subject: Re: [PATCH v4 6/7] staging: iio: ad5933: change attributes to match ABI

On Sat, 16 Mar 2019 12:07:55 -0300
Marcelo Schmitt <[email protected]> wrote:

> Change device attributes' names to match ABI documentation. Names were
> chosen such that they tend to be similar to existing ABI so it should
> be easier to standardize them when necessary.
>
> Signed-off-by: Marcelo Schmitt <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.

Thanks,

Jonathan

> ---
> .../staging/iio/impedance-analyzer/ad5933.c | 20 +++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
> index d75bdfbf93de..262415bc659d 100644
> --- a/drivers/staging/iio/impedance-analyzer/ad5933.c
> +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
> @@ -315,12 +315,12 @@ static ssize_t ad5933_store_frequency(struct device *dev,
> return ret ? ret : len;
> }
>
> -static IIO_DEVICE_ATTR(out_voltage0_freq_start, 0644,
> +static IIO_DEVICE_ATTR(out_altvoltage0_frequency_start, 0644,
> ad5933_show_frequency,
> ad5933_store_frequency,
> AD5933_REG_FREQ_START);
>
> -static IIO_DEVICE_ATTR(out_voltage0_freq_increment, 0644,
> +static IIO_DEVICE_ATTR(out_altvoltage0_frequency_increment, 0644,
> ad5933_show_frequency,
> ad5933_store_frequency,
> AD5933_REG_FREQ_INC);
> @@ -463,12 +463,12 @@ static IIO_DEVICE_ATTR(in_voltage0_scale_available, 0444,
> NULL,
> AD5933_IN_PGA_GAIN_AVAIL);
>
> -static IIO_DEVICE_ATTR(out_voltage0_freq_points, 0644,
> +static IIO_DEVICE_ATTR(out_altvoltage0_frequency_points, 0644,
> ad5933_show,
> ad5933_store,
> AD5933_FREQ_POINTS);
>
> -static IIO_DEVICE_ATTR(out_voltage0_settling_cycles, 0644,
> +static IIO_DEVICE_ATTR(out_altvoltage0_settling_cycles, 0644,
> ad5933_show,
> ad5933_store,
> AD5933_OUT_SETTLING_CYCLES);
> @@ -480,12 +480,12 @@ static IIO_DEVICE_ATTR(out_voltage0_settling_cycles, 0644,
> * don't create dedicated sysfs channel attributes for out0 and in0.
> */
> static struct attribute *ad5933_attributes[] = {
> - &iio_dev_attr_out_voltage0_scale.dev_attr.attr,
> - &iio_dev_attr_out_voltage0_scale_available.dev_attr.attr,
> - &iio_dev_attr_out_voltage0_freq_start.dev_attr.attr,
> - &iio_dev_attr_out_voltage0_freq_increment.dev_attr.attr,
> - &iio_dev_attr_out_voltage0_freq_points.dev_attr.attr,
> - &iio_dev_attr_out_voltage0_settling_cycles.dev_attr.attr,
> + &iio_dev_attr_out_altvoltage0_raw.dev_attr.attr,
> + &iio_dev_attr_out_altvoltage0_scale_available.dev_attr.attr,
> + &iio_dev_attr_out_altvoltage0_frequency_start.dev_attr.attr,
> + &iio_dev_attr_out_altvoltage0_frequency_increment.dev_attr.attr,
> + &iio_dev_attr_out_altvoltage0_frequency_points.dev_attr.attr,
> + &iio_dev_attr_out_altvoltage0_settling_cycles.dev_attr.attr,
> &iio_dev_attr_in_voltage0_scale.dev_attr.attr,
> &iio_dev_attr_in_voltage0_scale_available.dev_attr.attr,
> NULL

2019-03-16 18:53:38

by Jonathan Cameron

Subject: Re: [PATCH v4 6/7] staging: iio: ad5933: change attributes to match ABI

On Sat, 16 Mar 2019 12:07:55 -0300
Marcelo Schmitt <[email protected]> wrote:

> Change device attributes' names to match ABI documentation. Names were
> chosen such that they tend to be similar to existing ABI so it should
> be easier to standardize them when necessary.
>
> Signed-off-by: Marcelo Schmitt <[email protected]>
I spoke too soon on this one...

> ---
> .../staging/iio/impedance-analyzer/ad5933.c | 20 +++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
> index d75bdfbf93de..262415bc659d 100644
> --- a/drivers/staging/iio/impedance-analyzer/ad5933.c
> +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
> @@ -315,12 +315,12 @@ static ssize_t ad5933_store_frequency(struct device *dev,
> return ret ? ret : len;
> }
>
> -static IIO_DEVICE_ATTR(out_voltage0_freq_start, 0644,
> +static IIO_DEVICE_ATTR(out_altvoltage0_frequency_start, 0644,
> ad5933_show_frequency,
> ad5933_store_frequency,
> AD5933_REG_FREQ_START);
>
> -static IIO_DEVICE_ATTR(out_voltage0_freq_increment, 0644,
> +static IIO_DEVICE_ATTR(out_altvoltage0_frequency_increment, 0644,
> ad5933_show_frequency,
> ad5933_store_frequency,
> AD5933_REG_FREQ_INC);
> @@ -463,12 +463,12 @@ static IIO_DEVICE_ATTR(in_voltage0_scale_available, 0444,
> NULL,
> AD5933_IN_PGA_GAIN_AVAIL);
>
> -static IIO_DEVICE_ATTR(out_voltage0_freq_points, 0644,
> +static IIO_DEVICE_ATTR(out_altvoltage0_frequency_points, 0644,
> ad5933_show,
> ad5933_store,
> AD5933_FREQ_POINTS);
>
> -static IIO_DEVICE_ATTR(out_voltage0_settling_cycles, 0644,
> +static IIO_DEVICE_ATTR(out_altvoltage0_settling_cycles, 0644,
> ad5933_show,
> ad5933_store,
> AD5933_OUT_SETTLING_CYCLES);
> @@ -480,12 +480,12 @@ static IIO_DEVICE_ATTR(out_voltage0_settling_cycles, 0644,
> * don't create dedicated sysfs channel attributes for out0 and in0.
> */
> static struct attribute *ad5933_attributes[] = {
> - &iio_dev_attr_out_voltage0_scale.dev_attr.attr,
> - &iio_dev_attr_out_voltage0_scale_available.dev_attr.attr,
you rename this here, but not in the place where it's defined.

Doesn't build.
> - &iio_dev_attr_out_voltage0_freq_start.dev_attr.attr,
> - &iio_dev_attr_out_voltage0_freq_increment.dev_attr.attr,
> - &iio_dev_attr_out_voltage0_freq_points.dev_attr.attr,
> - &iio_dev_attr_out_voltage0_settling_cycles.dev_attr.attr,
> + &iio_dev_attr_out_altvoltage0_raw.dev_attr.attr,
> + &iio_dev_attr_out_altvoltage0_scale_available.dev_attr.attr,
> + &iio_dev_attr_out_altvoltage0_frequency_start.dev_attr.attr,
> + &iio_dev_attr_out_altvoltage0_frequency_increment.dev_attr.attr,
> + &iio_dev_attr_out_altvoltage0_frequency_points.dev_attr.attr,
> + &iio_dev_attr_out_altvoltage0_settling_cycles.dev_attr.attr,
> &iio_dev_attr_in_voltage0_scale.dev_attr.attr,
> &iio_dev_attr_in_voltage0_scale_available.dev_attr.attr,
> NULL