From 5b33953d854ac1ffef01264c7696d04335c36b1a Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Sat, 4 Sep 2010 17:54:47 +0100 Subject: [PATCH] --- yaml --- r: 219722 b: refs/heads/master c: 2d7770a9425b44ca487865de24587e420208d741 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/accel/adis16209_core.c | 4 ++-- trunk/drivers/staging/iio/sysfs.h | 7 ------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 4eefda572d4c..bfb2cdfc76b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99e5dc45b854b4b661044e807905152911ed3fdb +refs/heads/master: 2d7770a9425b44ca487865de24587e420208d741 diff --git a/trunk/drivers/staging/iio/accel/adis16209_core.c b/trunk/drivers/staging/iio/accel/adis16209_core.c index 9ee523a044d5..ab3988513d74 100644 --- a/trunk/drivers/staging/iio/accel/adis16209_core.c +++ b/trunk/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/trunk/drivers/staging/iio/sysfs.h b/trunk/drivers/staging/iio/sysfs.h index 96cc3a7a42ee..b531dc1db4f1 100644 --- a/trunk/drivers/staging/iio/sysfs.h +++ b/trunk/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)