From: Jonathan Cameron Date: Wed, 14 Sep 2011 12:01:24 +0000 (+0100) Subject: staging:iio:adc:ad7606 add channel type specification to range attributes. X-Git-Tag: v3.2-rc1~169^2^2~500 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cedd1a16bbe00456fb9abda237e9b1c2bc763edd;p=profile%2Fivi%2Fkernel-x86-ivi.git staging:iio:adc:ad7606 add channel type specification to range attributes. Cleaner and more consistent naming + makes one abi element we don't need go away. Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c index bea663d..f22f668 100644 --- a/drivers/staging/iio/adc/ad7606_core.c +++ b/drivers/staging/iio/adc/ad7606_core.c @@ -140,9 +140,9 @@ static ssize_t ad7606_store_range(struct device *dev, return count; } -static IIO_DEVICE_ATTR(range, S_IRUGO | S_IWUSR, \ +static IIO_DEVICE_ATTR(in_voltage_range, S_IRUGO | S_IWUSR, \ ad7606_show_range, ad7606_store_range, 0); -static IIO_CONST_ATTR(range_available, "5000 10000"); +static IIO_CONST_ATTR(in_voltage_range_available, "5000 10000"); static ssize_t ad7606_show_oversampling_ratio(struct device *dev, struct device_attribute *attr, char *buf) @@ -198,8 +198,8 @@ static IIO_DEVICE_ATTR(oversampling_ratio, S_IRUGO | S_IWUSR, static IIO_CONST_ATTR(oversampling_ratio_available, "0 2 4 8 16 32 64"); static struct attribute *ad7606_attributes[] = { - &iio_dev_attr_range.dev_attr.attr, - &iio_const_attr_range_available.dev_attr.attr, + &iio_dev_attr_in_voltage_range.dev_attr.attr, + &iio_const_attr_in_voltage_range_available.dev_attr.attr, &iio_dev_attr_oversampling_ratio.dev_attr.attr, &iio_const_attr_oversampling_ratio_available.dev_attr.attr, NULL, @@ -220,9 +220,10 @@ static mode_t ad7606_attr_is_visible(struct kobject *kobj, &iio_const_attr_oversampling_ratio_available.dev_attr.attr)) mode = 0; else if (!st->have_range && - (attr == &iio_dev_attr_range.dev_attr.attr || - attr == &iio_const_attr_range_available.dev_attr.attr)) - mode = 0; + (attr == &iio_dev_attr_in_voltage_range.dev_attr.attr || + attr == + &iio_const_attr_in_voltage_range_available.dev_attr.attr)) + mode = 0; return mode; }