staging: iio: Remove deprecated ATTR_TEMP in favour of ATTR_TEMP_RAW

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Manuel Stahl <manuel.stahl@iis.fraunhofer.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/iio/accel/adis16209_core.c b/drivers/staging/iio/accel/adis16209_core.c
index 9ee523a044d553c8a5880c8c90e65f7a13a0b329..ab3988513d749f7ae22e5038f520b98338c76ea0 100644 (file)
--- a/drivers/staging/iio/accel/adis16209_core.c
+++ b/drivers/staging/iio/accel/adis16209_core.c
@@ -421,7 +421,7 @@ static IIO_CONST_ATTR(incli_scale, "0.00043633231");
 static IIO_DEVICE_ATTR(rot_raw, S_IRUGO, adis16209_read_14bit_signed,
                       NULL, ADIS16209_ROT_OUT);
 
-static IIO_DEV_ATTR_TEMP(adis16209_read_temp);
+static IIO_DEV_ATTR_TEMP_RAW(adis16209_read_temp);
 static IIO_CONST_ATTR_TEMP_OFFSET("25");
 static IIO_CONST_ATTR_TEMP_SCALE("-0.47");
 
@@ -440,7 +440,7 @@ static struct attribute_group adis16209_event_attribute_group = {
 static struct attribute *adis16209_attributes[] = {
        &iio_dev_attr_in_supply_raw.dev_attr.attr,
        &iio_const_attr_in_supply_scale.dev_attr.attr,
-       &iio_dev_attr_temp.dev_attr.attr,
+       &iio_dev_attr_temp_raw.dev_attr.attr,
        &iio_const_attr_temp_offset.dev_attr.attr,
        &iio_const_attr_temp_scale.dev_attr.attr,
        &iio_dev_attr_reset.dev_attr.attr,

diff --git a/drivers/staging/iio/sysfs.h b/drivers/staging/iio/sysfs.h
index 96cc3a7a42ee36383e9a49a1b8e0cfa8e21be5c4..b531dc1db4f1a1a46f8cd2efe11fa741f77e09a7 100644 (file)
--- a/drivers/staging/iio/sysfs.h
+++ b/drivers/staging/iio/sysfs.h
@@ -161,13 +161,6 @@ struct iio_const_attr {
 #define IIO_DEV_ATTR_HW_RING_ENABLE(_show, _store)                     \
        IIO_DEVICE_ATTR(hw_ring_enable, S_IRUGO | S_IWUSR, _show, _store, 0)
 
-/**
- * IIO_DEV_ATTR_TEMP - many sensors have auxiliary temperature sensors
- * @_show: output method for the attribute
- **/
-#define IIO_DEV_ATTR_TEMP(_show)                       \
-       IIO_DEVICE_ATTR(temp, S_IRUGO, _show, NULL, 0)
-
 #define IIO_DEV_ATTR_TEMP_RAW(_show)                   \
        IIO_DEVICE_ATTR(temp_raw, S_IRUGO, _show, NULL, 0)