From: Jonathan Cameron Date: Tue, 21 Sep 2010 13:41:07 +0000 (+0100) Subject: staging: iio: remove deprecated form of scan_el attribute naming. X-Git-Tag: upstream/snapshot3+hdmi~12602^2~3^2~511 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3215e31cc30cecdc4465bd1c5f36e1e898e686a1;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git staging: iio: remove deprecated form of scan_el attribute naming. This has been replaced by a separate _index attribute Signed-off-by: Jonathan Cameron Signed-off-by: Manuel Stahl Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h index 1daeb01..abd52ea 100644 --- a/drivers/staging/iio/ring_generic.h +++ b/drivers/staging/iio/ring_generic.h @@ -236,7 +236,7 @@ ssize_t iio_scan_el_ts_show(struct device *dev, struct device_attribute *attr, **/ #define __IIO_SCAN_EL_C(_name, _number, _label, _controlfunc) \ struct iio_scan_el iio_scan_el_##_name = { \ - .dev_attr = __ATTR(_number##_##_name##_en, \ + .dev_attr = __ATTR(_name##_en, \ S_IRUGO | S_IWUSR, \ iio_scan_el_show, \ iio_scan_el_store), \ @@ -251,7 +251,7 @@ ssize_t iio_scan_el_ts_show(struct device *dev, struct device_attribute *attr, #define __IIO_SCAN_NAMED_EL_C(_name, _string, _number, _label, _cf) \ struct iio_scan_el iio_scan_el_##_name = { \ - .dev_attr = __ATTR(_number##_##_string##_en, \ + .dev_attr = __ATTR(_string##_en, \ S_IRUGO | S_IWUSR, \ iio_scan_el_show, \ iio_scan_el_store), \ @@ -276,7 +276,7 @@ ssize_t iio_scan_el_ts_show(struct device *dev, struct device_attribute *attr, **/ #define IIO_SCAN_EL_TIMESTAMP(number) \ struct iio_scan_el iio_scan_el_timestamp = { \ - .dev_attr = __ATTR(number##_timestamp_en, \ + .dev_attr = __ATTR(_timestamp_en, \ S_IRUGO | S_IWUSR, \ iio_scan_el_ts_show, \ iio_scan_el_ts_store), \