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/dac | |
parent | 1b732888d83f71a31a4bd26290ca8a00df1bf928 (diff) | |
download | kernel_samsung_smdk4412-845bd12ac78f92ba8905f45de7e17a4a8b3cef40.zip kernel_samsung_smdk4412-845bd12ac78f92ba8905f45de7e17a4a8b3cef40.tar.gz kernel_samsung_smdk4412-845bd12ac78f92ba8905f45de7e17a4a8b3cef40.tar.bz2 |
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/dac')
-rw-r--r-- | drivers/staging/iio/dac/ad5446.c | 13 | ||||
-rw-r--r-- | drivers/staging/iio/dac/ad5504.c | 15 | ||||
-rw-r--r-- | drivers/staging/iio/dac/ad5624r_spi.c | 13 |
3 files changed, 3 insertions, 38 deletions
diff --git a/drivers/staging/iio/dac/ad5446.c b/drivers/staging/iio/dac/ad5446.c index fd4fa54..22646a6 100644 --- a/drivers/staging/iio/dac/ad5446.c +++ b/drivers/staging/iio/dac/ad5446.c @@ -106,17 +106,6 @@ static ssize_t ad5446_show_scale(struct device *dev, } static IIO_DEVICE_ATTR(out_scale, S_IRUGO, ad5446_show_scale, NULL, 0); -static ssize_t ad5446_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad5446_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, ad5446_show_name, NULL, 0); - static ssize_t ad5446_write_powerdown_mode(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) @@ -204,7 +193,6 @@ static struct attribute *ad5446_attributes[] = { &iio_dev_attr_out0_powerdown.dev_attr.attr, &iio_dev_attr_out_powerdown_mode.dev_attr.attr, &iio_const_attr_out_powerdown_mode_available.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -381,6 +369,7 @@ static int __devinit ad5446_probe(struct spi_device *spi) /* Estabilish 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 = &ad5446_attribute_group; st->indio_dev->dev_data = (void *)(st); st->indio_dev->driver_module = THIS_MODULE; diff --git a/drivers/staging/iio/dac/ad5504.c b/drivers/staging/iio/dac/ad5504.c index 5534c41..351a9d3 100644 --- a/drivers/staging/iio/dac/ad5504.c +++ b/drivers/staging/iio/dac/ad5504.c @@ -170,17 +170,6 @@ static ssize_t ad5504_show_scale(struct device *dev, } static IIO_DEVICE_ATTR(out_scale, S_IRUGO, ad5504_show_scale, NULL, 0); -static ssize_t ad5504_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *indio_dev = dev_get_drvdata(dev); - struct ad5504_state *st = iio_dev_get_devdata(indio_dev); - - return sprintf(buf, "%s\n", spi_get_device_id(st->spi)->name); -} -static IIO_DEVICE_ATTR(name, S_IRUGO, ad5504_show_name, NULL, 0); - #define IIO_DEV_ATTR_OUT_RW_RAW(_num, _show, _store, _addr) \ IIO_DEVICE_ATTR(out##_num##_raw, \ S_IRUGO | S_IWUSR, _show, _store, _addr) @@ -226,7 +215,6 @@ static struct attribute *ad5504_attributes[] = { &iio_dev_attr_out_powerdown_mode.dev_attr.attr, &iio_const_attr_out_powerdown_mode_available.dev_attr.attr, &iio_dev_attr_out_scale.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -240,7 +228,6 @@ static struct attribute *ad5501_attributes[] = { &iio_dev_attr_out_powerdown_mode.dev_attr.attr, &iio_const_attr_out_powerdown_mode_available.dev_attr.attr, &iio_dev_attr_out_scale.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -310,7 +297,7 @@ static int __devinit ad5504_probe(struct spi_device *spi) goto error_disable_reg; } st->indio_dev->dev.parent = &spi->dev; - + st->indio_dev->name = spi_get_device_id(st->spi)->name; st->indio_dev->attrs = spi_get_device_id(st->spi)->driver_data == ID_AD5501 ? &ad5501_attribute_group : &ad5504_attribute_group; diff --git a/drivers/staging/iio/dac/ad5624r_spi.c b/drivers/staging/iio/dac/ad5624r_spi.c index cfb5828..b0e25e2 100644 --- a/drivers/staging/iio/dac/ad5624r_spi.c +++ b/drivers/staging/iio/dac/ad5624r_spi.c @@ -174,17 +174,6 @@ static ssize_t ad5624r_show_scale(struct device *dev, } static IIO_DEVICE_ATTR(out_scale, S_IRUGO, ad5624r_show_scale, NULL, 0); -static ssize_t ad5624r_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *indio_dev = dev_get_drvdata(dev); - struct ad5624r_state *st = iio_dev_get_devdata(indio_dev); - - return sprintf(buf, "%s\n", spi_get_device_id(st->us)->name); -} -static IIO_DEVICE_ATTR(name, S_IRUGO, ad5624r_show_name, NULL, 0); - 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); @@ -222,7 +211,6 @@ static struct attribute *ad5624r_attributes[] = { &iio_dev_attr_out_powerdown_mode.dev_attr.attr, &iio_const_attr_out_powerdown_mode_available.dev_attr.attr, &iio_dev_attr_out_scale.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -266,6 +254,7 @@ static int __devinit ad5624r_probe(struct spi_device *spi) goto error_disable_reg; } st->indio_dev->dev.parent = &spi->dev; + st->indio_dev->name = spi_get_device_id(spi)->name; st->indio_dev->attrs = &ad5624r_attribute_group; st->indio_dev->dev_data = (void *)(st); st->indio_dev->driver_module = THIS_MODULE; |