[Linux-kernel-commits] [9327] trunk/drivers/staging/iio: merge from upstream: staging: iio: Remove deprecated ATTR_TEMP in favour of ATTR_TEMP_RAW

Sun, 24 Oct 2010 13:39:31 -0700

Title: [9327] trunk/drivers/staging/iio: merge from upstream: staging: iio: Remove deprecated ATTR_TEMP in favour of ATTR_TEMP_RAW
Revision
9327
Author
vapier
Date
2010-10-24 16:39:22 -0400 (Sun, 24 Oct 2010)

Log Message

merge from upstream: staging: iio: Remove deprecated ATTR_TEMP in favour of ATTR_TEMP_RAW

From: Jonathan Cameron <[email protected]>

Signed-off-by: Jonathan Cameron <[email protected]>
Acked-by: Manuel Stahl <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Modified Paths

Diff

Modified: trunk/drivers/staging/iio/accel/adis16209_core.c (9326 => 9327)


--- trunk/drivers/staging/iio/accel/adis16209_core.c	2010-10-24 20:39:18 UTC (rev 9326)
+++ trunk/drivers/staging/iio/accel/adis16209_core.c	2010-10-24 20:39:22 UTC (rev 9327)
@@ -421,7 +421,7 @@
 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 *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,

Modified: trunk/drivers/staging/iio/sysfs.h (9326 => 9327)


--- trunk/drivers/staging/iio/sysfs.h	2010-10-24 20:39:18 UTC (rev 9326)
+++ trunk/drivers/staging/iio/sysfs.h	2010-10-24 20:39:22 UTC (rev 9327)
@@ -167,13 +167,6 @@
 #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)
 

_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to