diff options
Diffstat (limited to 'drivers/staging/iio/meter/ade7754.c')
| -rw-r--r-- | drivers/staging/iio/meter/ade7754.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c index 4272818e7dc4..378f2c87086f 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, @@ -530,7 +527,10 @@ static const struct attribute_group ade7754_attribute_group = { .attrs = ade7754_attributes, }; - +static const struct iio_info ade7754_info = { + .attrs = &ade7754_attribute_group, + .driver_module = THIS_MODULE, +}; static int __devinit ade7754_probe(struct spi_device *spi) { @@ -557,16 +557,16 @@ static int __devinit ade7754_probe(struct spi_device *spi) st->us = spi; mutex_init(&st->buf_lock); /* setup the industrialio driver allocated elements */ - st->indio_dev = iio_allocate_device(); + st->indio_dev = iio_allocate_device(0); if (st->indio_dev == NULL) { ret = -ENOMEM; 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->info = &ade7754_info; st->indio_dev->dev_data = (void *)(st); - st->indio_dev->driver_module = THIS_MODULE; st->indio_dev->modes = INDIO_DIRECT_MODE; ret = iio_device_register(st->indio_dev); |