Skip to site navigation (Press enter)

[Linux-kernel-commits] [9357] trunk/drivers/staging/iio/ring_generic.h: merge from upstream: staging: iio: remove deprecated form of scan_el attribute naming.

vapier Sun, 24 Oct 2010 13:42:56 -0700

Title: [9357] trunk/drivers/staging/iio/ring_generic.h: merge from upstream: staging: iio: remove deprecated form of scan_el attribute naming.

Revision: 9357
Author: vapier
Date: 2010-10-24 16:42:46 -0400 (Sun, 24 Oct 2010)

Log Message

merge from upstream: staging: iio: remove deprecated form of scan_el attribute naming.


From: Jonathan Cameron <[email protected]>

This has been replaced by a separate _index attribute

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

Modified Paths

trunk/drivers/staging/iio/ring_generic.h

Diff

Modified: trunk/drivers/staging/iio/ring_generic.h (9356 => 9357)


--- trunk/drivers/staging/iio/ring_generic.h	2010-10-24 20:42:42 UTC (rev 9356)
+++ trunk/drivers/staging/iio/ring_generic.h	2010-10-24 20:42:46 UTC (rev 9357)
@@ -236,7 +236,7 @@
  **/
 #define __IIO_SCAN_EL_C(_name, _number, _label, _controlfunc)	\
 	struct iio_scan_el iio_scan_el_##_name = {			\
-		.dev_attr = __ATTR(_number##_##_name##_en,		\
+		.dev_attr = __ATTR(_name##_en,				\
 				   S_IRUGO | S_IWUSR,			\
 				   iio_scan_el_show,			\
 				   iio_scan_el_store),			\
@@ -251,7 +251,7 @@
 
 #define __IIO_SCAN_NAMED_EL_C(_name, _string, _number, _label, _cf)	\
 	struct iio_scan_el iio_scan_el_##_name = {			\
-		.dev_attr = __ATTR(_number##_##_string##_en,		\
+		.dev_attr = __ATTR(_string##_en,			\
 				   S_IRUGO | S_IWUSR,			\
 				   iio_scan_el_show,			\
 				   iio_scan_el_store),			\
@@ -276,7 +276,7 @@
  **/
 #define IIO_SCAN_EL_TIMESTAMP(number)				\
 	struct iio_scan_el iio_scan_el_timestamp = {		\
-		.dev_attr = __ATTR(number##_timestamp_en,	\
+		.dev_attr = __ATTR(_timestamp_en,		\
 				   S_IRUGO | S_IWUSR,		\
 				   iio_scan_el_ts_show,		\
 				   iio_scan_el_ts_store),	\

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