diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2010-09-04 17:54:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-04 21:19:00 -0700 |
| commit | 2d7770a9425b44ca487865de24587e420208d741 (patch) | |
| tree | cdc5be516404253fc15ff34dd1f3b224756a1e28 /drivers/staging | |
| parent | 99e5dc45b854b4b661044e807905152911ed3fdb (diff) | |
| download | op-kernel-dev-2d7770a9425b44ca487865de24587e420208d741.zip op-kernel-dev-2d7770a9425b44ca487865de24587e420208d741.tar.gz | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/iio/accel/adis16209_core.c | 4 | ||||
| -rw-r--r-- | drivers/staging/iio/sysfs.h | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/iio/accel/adis16209_core.c b/drivers/staging/iio/accel/adis16209_core.c index 9ee523a..ab39885 100644 --- 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 96cc3a7..b531dc1 100644 --- 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) |
