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/adc/ad7780.c | |
| parent | 1b732888d83f71a31a4bd26290ca8a00df1bf928 (diff) | |
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/adc/ad7780.c')
| -rw-r--r-- | drivers/staging/iio/adc/ad7780.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c index ab23c5cfdc22..f828e832a95f 100644 --- a/drivers/staging/iio/adc/ad7780.c +++ b/drivers/staging/iio/adc/ad7780.c @@ -132,21 +132,9 @@ static ssize_t ad7780_show_scale(struct device *dev, } static IIO_DEVICE_ATTR(in_scale, S_IRUGO, ad7780_show_scale, NULL, 0); -static ssize_t ad7780_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad7780_state *st = iio_dev_get_devdata(dev_info); - - return sprintf(buf, "%s\n", spi_get_device_id(st->spi)->name); -} -static IIO_DEVICE_ATTR(name, S_IRUGO, ad7780_show_name, NULL, 0); - static struct attribute *ad7780_attributes[] = { &iio_dev_attr_in0_raw.dev_attr.attr, &iio_dev_attr_in_scale.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -229,6 +217,7 @@ static int __devinit ad7780_probe(struct spi_device *spi) /* Establish that the iio_dev is a child of the spi device */ st->indio_dev->dev.parent = &spi->dev; + st->indio_dev->name = spi_get_device_id(spi)->name; st->indio_dev->attrs = &ad7780_attribute_group; st->indio_dev->dev_data = (void *)(st); st->indio_dev->driver_module = THIS_MODULE; |