diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-05-18 14:41:44 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 16:14:54 -0700 |
commit | 845bd12ac78f92ba8905f45de7e17a4a8b3cef40 (patch) | |
tree | 5a021f5173861619b66a6baf68772a14ace95f92 /drivers/staging/iio/meter | |
parent | 1b732888d83f71a31a4bd26290ca8a00df1bf928 (diff) | |
download | op-kernel-dev-845bd12ac78f92ba8905f45de7e17a4a8b3cef40.zip op-kernel-dev-845bd12ac78f92ba8905f45de7e17a4a8b3cef40.tar.gz |
staging:iio: use the new central name attribute creation code
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/meter')
-rw-r--r-- | drivers/staging/iio/meter/ade7753.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/meter/ade7754.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/meter/ade7758_core.c | 4 | ||||
-rw-r--r-- | drivers/staging/iio/meter/ade7759.c | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c index d62d9e2..8b6bf50 100644 --- a/drivers/staging/iio/meter/ade7753.c +++ b/drivers/staging/iio/meter/ade7753.c @@ -463,8 +463,6 @@ static IIO_DEV_ATTR_RESET(ade7753_write_reset); static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("27900 14000 7000 3500"); -static IIO_CONST_ATTR(name, "ade7753"); - static struct attribute *ade7753_attributes[] = { &iio_dev_attr_temp_raw.dev_attr.attr, &iio_const_attr_temp_offset.dev_attr.attr, @@ -472,7 +470,6 @@ static struct attribute *ade7753_attributes[] = { &iio_dev_attr_sampling_frequency.dev_attr.attr, &iio_const_attr_sampling_frequency_available.dev_attr.attr, &iio_dev_attr_reset.dev_attr.attr, - &iio_const_attr_name.dev_attr.attr, &iio_dev_attr_phcal.dev_attr.attr, &iio_dev_attr_cfden.dev_attr.attr, &iio_dev_attr_aenergy.dev_attr.attr, @@ -538,6 +535,7 @@ static int __devinit ade7753_probe(struct spi_device *spi) goto error_free_tx; } + st->indio_dev->name = spi->dev.driver->name; st->indio_dev->dev.parent = &spi->dev; st->indio_dev->attrs = &ade7753_attribute_group; st->indio_dev->dev_data = (void *)(st); diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c index 2d0b8cc..4179325 100644 --- a/drivers/staging/iio/meter/ade7754.c +++ b/drivers/staging/iio/meter/ade7754.c @@ -482,8 +482,6 @@ static IIO_DEV_ATTR_RESET(ade7754_write_reset); static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("26000 13000 65000 33000"); -static IIO_CONST_ATTR(name, "ade7754"); - static struct attribute *ade7754_attributes[] = { &iio_dev_attr_temp_raw.dev_attr.attr, &iio_const_attr_temp_offset.dev_attr.attr, @@ -491,7 +489,6 @@ static struct attribute *ade7754_attributes[] = { &iio_dev_attr_sampling_frequency.dev_attr.attr, &iio_const_attr_sampling_frequency_available.dev_attr.attr, &iio_dev_attr_reset.dev_attr.attr, - &iio_const_attr_name.dev_attr.attr, &iio_dev_attr_aenergy.dev_attr.attr, &iio_dev_attr_laenergy.dev_attr.attr, &iio_dev_attr_vaenergy.dev_attr.attr, @@ -563,6 +560,7 @@ static int __devinit ade7754_probe(struct spi_device *spi) goto error_free_tx; } + st->indio_dev->name = spi->dev.driver->name; st->indio_dev->dev.parent = &spi->dev; st->indio_dev->attrs = &ade7754_attribute_group; st->indio_dev->dev_data = (void *)(st); diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c index cab31dd..c9956c4 100644 --- a/drivers/staging/iio/meter/ade7758_core.c +++ b/drivers/staging/iio/meter/ade7758_core.c @@ -650,8 +650,6 @@ static IIO_DEV_ATTR_RESET(ade7758_write_reset); static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("26000 13000 65000 33000"); -static IIO_CONST_ATTR(name, "ade7758"); - static struct attribute *ade7758_attributes[] = { &iio_dev_attr_temp_raw.dev_attr.attr, &iio_const_attr_temp_offset.dev_attr.attr, @@ -660,7 +658,6 @@ static struct attribute *ade7758_attributes[] = { &iio_dev_attr_waveform_type.dev_attr.attr, &iio_const_attr_sampling_frequency_available.dev_attr.attr, &iio_dev_attr_reset.dev_attr.attr, - &iio_const_attr_name.dev_attr.attr, &iio_dev_attr_awatthr.dev_attr.attr, &iio_dev_attr_bwatthr.dev_attr.attr, &iio_dev_attr_cwatthr.dev_attr.attr, @@ -735,6 +732,7 @@ static int __devinit ade7758_probe(struct spi_device *spi) goto error_free_tx; } + st->indio_dev->name = spi->dev.driver->name; st->indio_dev->dev.parent = &spi->dev; st->indio_dev->attrs = &ade7758_attribute_group; st->indio_dev->dev_data = (void *)(st); diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c index 42b3b27..86fe0ae 100644 --- a/drivers/staging/iio/meter/ade7759.c +++ b/drivers/staging/iio/meter/ade7759.c @@ -422,8 +422,6 @@ static IIO_DEV_ATTR_RESET(ade7759_write_reset); static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("27900 14000 7000 3500"); -static IIO_CONST_ATTR(name, "ade7759"); - static struct attribute *ade7759_attributes[] = { &iio_dev_attr_temp_raw.dev_attr.attr, &iio_const_attr_temp_offset.dev_attr.attr, @@ -431,7 +429,6 @@ static struct attribute *ade7759_attributes[] = { &iio_dev_attr_sampling_frequency.dev_attr.attr, &iio_const_attr_sampling_frequency_available.dev_attr.attr, &iio_dev_attr_reset.dev_attr.attr, - &iio_const_attr_name.dev_attr.attr, &iio_dev_attr_phcal.dev_attr.attr, &iio_dev_attr_cfden.dev_attr.attr, &iio_dev_attr_aenergy.dev_attr.attr, @@ -484,6 +481,7 @@ static int __devinit ade7759_probe(struct spi_device *spi) goto error_free_tx; } + st->indio_dev->name = spi->dev.driver->name; st->indio_dev->dev.parent = &spi->dev; st->indio_dev->num_interrupt_lines = 1; |