Skip to content

Commit

Permalink
staging: iio: dac: Update drivers to use new attribute naming
Browse files Browse the repository at this point in the history 
Remove depreciated macro from header

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Michael Hennerich authored and Greg Kroah-Hartman committed Nov 20, 2010
1 parent 5a7f4fd commit 51f8ad3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
16 changes: 8 additions & 8 deletions drivers/staging/iio/dac/ad5624r_spi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@ static ssize_t ad5624r_write_internal_ref_mode(struct device *dev,
return ret ? ret : len;
}

static IIO_DEV_ATTR_DAC(0, ad5624r_write_dac, AD5624R_ADDR_DAC0);
static IIO_DEV_ATTR_DAC(1, ad5624r_write_dac, AD5624R_ADDR_DAC1);
static IIO_DEV_ATTR_DAC(2, ad5624r_write_dac, AD5624R_ADDR_DAC2);
static IIO_DEV_ATTR_DAC(3, ad5624r_write_dac, AD5624R_ADDR_DAC3);
static IIO_DEV_ATTR_OUT_RAW(0, ad5624r_write_dac, AD5624R_ADDR_DAC0);
static IIO_DEV_ATTR_OUT_RAW(1, ad5624r_write_dac, AD5624R_ADDR_DAC1);
static IIO_DEV_ATTR_OUT_RAW(2, ad5624r_write_dac, AD5624R_ADDR_DAC2);
static IIO_DEV_ATTR_OUT_RAW(3, ad5624r_write_dac, AD5624R_ADDR_DAC3);

static IIO_DEVICE_ATTR(ldac_mode, S_IRUGO | S_IWUSR, ad5624r_read_ldac_mode,
ad5624r_write_ldac_mode, 0);
Expand All @@ -199,10 +199,10 @@ static IIO_DEV_ATTR_DAC_POWER_MODE(2, ad5624r_read_dac_power_mode, ad5624r_write
static IIO_DEV_ATTR_DAC_POWER_MODE(3, ad5624r_read_dac_power_mode, ad5624r_write_dac_power_mode, 3);

static struct attribute *ad5624r_attributes[] = {
&iio_dev_attr_dac_0.dev_attr.attr,
&iio_dev_attr_dac_1.dev_attr.attr,
&iio_dev_attr_dac_2.dev_attr.attr,
&iio_dev_attr_dac_3.dev_attr.attr,
&iio_dev_attr_out0_raw.dev_attr.attr,
&iio_dev_attr_out1_raw.dev_attr.attr,
&iio_dev_attr_out2_raw.dev_attr.attr,
&iio_dev_attr_out3_raw.dev_attr.attr,
&iio_dev_attr_dac_power_mode_0.dev_attr.attr,
&iio_dev_attr_dac_power_mode_1.dev_attr.attr,
&iio_dev_attr_dac_power_mode_2.dev_attr.attr,
Expand Down
4 changes: 0 additions & 4 deletions drivers/staging/iio/dac/dac.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,5 @@
* dac.h - sysfs attributes associated with DACs
*/

/* Deprecated */
#define IIO_DEV_ATTR_DAC(_num, _store, _addr) \
IIO_DEVICE_ATTR(dac_##_num, S_IWUSR, NULL, _store, _addr)

#define IIO_DEV_ATTR_OUT_RAW(_num, _store, _addr) \
IIO_DEVICE_ATTR(out##_num##_raw, S_IWUSR, NULL, _store, _addr)

0 comments on commit 51f8ad3

Please sign in to comment.