[Linux-kernel-commits] [9355] trunk/drivers/staging/iio/adc/max1363_core.c: merge from upstream: staging: iio: max1363 add _index attribute registration

Sun, 24 Oct 2010 13:42:49 -0700

Title: [9355] trunk/drivers/staging/iio/adc/max1363_core.c: merge from upstream: staging: iio: max1363 add _index attribute registration
Revision
9355
Author
vapier
Date
2010-10-24 16:42:38 -0400 (Sun, 24 Oct 2010)

Log Message

merge from upstream: staging: iio: max1363 add _index attribute registration

From: Jonathan Cameron <[email protected]>

Also fixes a missing NULL to terminate one of the attribute arrays.

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

Modified Paths

Diff

Modified: trunk/drivers/staging/iio/adc/max1363_core.c (9354 => 9355)


--- trunk/drivers/staging/iio/adc/max1363_core.c	2010-10-24 20:42:34 UTC (rev 9354)
+++ trunk/drivers/staging/iio/adc/max1363_core.c	2010-10-24 20:42:38 UTC (rev 9355)
@@ -385,13 +385,21 @@
 
 static struct attribute *max1363_scan_el_attrs[] = {
 	&iio_scan_el_in0.dev_attr.attr,	&dev_attr_in0_type.attr,
+	&iio_const_attr_in0_index.dev_attr.attr,
 	&iio_scan_el_in1.dev_attr.attr,	&dev_attr_in1_type.attr,
+	&iio_const_attr_in1_index.dev_attr.attr,
 	&iio_scan_el_in2.dev_attr.attr,	&dev_attr_in2_type.attr,
+	&iio_const_attr_in2_index.dev_attr.attr,
 	&iio_scan_el_in3.dev_attr.attr,	&dev_attr_in3_type.attr,
+	&iio_const_attr_in3_index.dev_attr.attr,
 	&iio_scan_el_in0min1.dev_attr.attr,	&dev_attr_in0min1_type.attr,
+	&iio_const_attr_in0min1_index.dev_attr.attr,
 	&iio_scan_el_in2min3.dev_attr.attr,	&dev_attr_in2min3_type.attr,
+	&iio_const_attr_in2min3_index.dev_attr.attr,
 	&iio_scan_el_in1min0.dev_attr.attr,	&dev_attr_in1min0_type.attr,
+	&iio_const_attr_in1min0_index.dev_attr.attr,
 	&iio_scan_el_in3min2.dev_attr.attr,	&dev_attr_in3min2_type.attr,
+	&iio_const_attr_in3min2_index.dev_attr.attr,
 	NULL,
 };
 
@@ -458,29 +466,53 @@
 
 static struct attribute *max1238_scan_el_attrs[] = {
 	&iio_scan_el_in0.dev_attr.attr,	&dev_attr_in0_type.attr,
+	&iio_const_attr_in0_index.dev_attr.attr,
 	&iio_scan_el_in1.dev_attr.attr,	&dev_attr_in1_type.attr,
+	&iio_const_attr_in1_index.dev_attr.attr,
 	&iio_scan_el_in2.dev_attr.attr,	&dev_attr_in2_type.attr,
+	&iio_const_attr_in2_index.dev_attr.attr,
 	&iio_scan_el_in3.dev_attr.attr,	&dev_attr_in3_type.attr,
+	&iio_const_attr_in3_index.dev_attr.attr,
 	&iio_scan_el_in4.dev_attr.attr,	&dev_attr_in4_type.attr,
+	&iio_const_attr_in4_index.dev_attr.attr,
 	&iio_scan_el_in5.dev_attr.attr,	&dev_attr_in5_type.attr,
+	&iio_const_attr_in5_index.dev_attr.attr,
 	&iio_scan_el_in6.dev_attr.attr,	&dev_attr_in6_type.attr,
+	&iio_const_attr_in6_index.dev_attr.attr,
 	&iio_scan_el_in7.dev_attr.attr,	&dev_attr_in7_type.attr,
+	&iio_const_attr_in7_index.dev_attr.attr,
 	&iio_scan_el_in8.dev_attr.attr,	&dev_attr_in8_type.attr,
+	&iio_const_attr_in8_index.dev_attr.attr,
 	&iio_scan_el_in9.dev_attr.attr,	&dev_attr_in9_type.attr,
+	&iio_const_attr_in9_index.dev_attr.attr,
 	&iio_scan_el_in10.dev_attr.attr,	&dev_attr_in10_type.attr,
+	&iio_const_attr_in10_index.dev_attr.attr,
 	&iio_scan_el_in11.dev_attr.attr,	&dev_attr_in11_type.attr,
+	&iio_const_attr_in11_index.dev_attr.attr,
 	&iio_scan_el_in0min1.dev_attr.attr,	&dev_attr_in0min1_type.attr,
+	&iio_const_attr_in0min1_index.dev_attr.attr,
 	&iio_scan_el_in2min3.dev_attr.attr,	&dev_attr_in2min3_type.attr,
+	&iio_const_attr_in2min3_index.dev_attr.attr,
 	&iio_scan_el_in4min5.dev_attr.attr,	&dev_attr_in4min5_type.attr,
+	&iio_const_attr_in4min5_index.dev_attr.attr,
 	&iio_scan_el_in6min7.dev_attr.attr,	&dev_attr_in6min7_type.attr,
+	&iio_const_attr_in6min7_index.dev_attr.attr,
 	&iio_scan_el_in8min9.dev_attr.attr,	&dev_attr_in8min9_type.attr,
+	&iio_const_attr_in8min9_index.dev_attr.attr,
 	&iio_scan_el_in10min11.dev_attr.attr,	&dev_attr_in10min11_type.attr,
+	&iio_const_attr_in10min11_index.dev_attr.attr,
 	&iio_scan_el_in1min0.dev_attr.attr,	&dev_attr_in1min0_type.attr,
+	&iio_const_attr_in1min0_index.dev_attr.attr,
 	&iio_scan_el_in3min2.dev_attr.attr,	&dev_attr_in3min2_type.attr,
+	&iio_const_attr_in3min2_index.dev_attr.attr,
 	&iio_scan_el_in5min4.dev_attr.attr,	&dev_attr_in5min4_type.attr,
+	&iio_const_attr_in5min4_index.dev_attr.attr,
 	&iio_scan_el_in7min6.dev_attr.attr,	&dev_attr_in7min6_type.attr,
+	&iio_const_attr_in7min6_index.dev_attr.attr,
 	&iio_scan_el_in9min8.dev_attr.attr,	&dev_attr_in9min8_type.attr,
+	&iio_const_attr_in9min8_index.dev_attr.attr,
 	&iio_scan_el_in11min10.dev_attr.attr,	&dev_attr_in11min10_type.attr,
+	&iio_const_attr_in11min10_index.dev_attr.attr,
 	NULL,
 };
 
@@ -536,21 +568,38 @@
 
 static struct attribute *max11608_scan_el_attrs[] = {
 	&iio_scan_el_in0.dev_attr.attr,	&dev_attr_in0_type.attr,
+	&iio_const_attr_in0_index.dev_attr.attr,
 	&iio_scan_el_in1.dev_attr.attr,	&dev_attr_in1_type.attr,
+	&iio_const_attr_in1_index.dev_attr.attr,
 	&iio_scan_el_in2.dev_attr.attr,	&dev_attr_in2_type.attr,
+	&iio_const_attr_in2_index.dev_attr.attr,
 	&iio_scan_el_in3.dev_attr.attr,	&dev_attr_in3_type.attr,
+	&iio_const_attr_in3_index.dev_attr.attr,
 	&iio_scan_el_in4.dev_attr.attr,	&dev_attr_in4_type.attr,
+	&iio_const_attr_in4_index.dev_attr.attr,
 	&iio_scan_el_in5.dev_attr.attr,	&dev_attr_in5_type.attr,
+	&iio_const_attr_in5_index.dev_attr.attr,
 	&iio_scan_el_in6.dev_attr.attr,	&dev_attr_in6_type.attr,
+	&iio_const_attr_in6_index.dev_attr.attr,
 	&iio_scan_el_in7.dev_attr.attr,	&dev_attr_in7_type.attr,
+	&iio_const_attr_in7_index.dev_attr.attr,
 	&iio_scan_el_in0min1.dev_attr.attr,	&dev_attr_in0min1_type.attr,
+	&iio_const_attr_in0min1_index.dev_attr.attr,
 	&iio_scan_el_in2min3.dev_attr.attr,	&dev_attr_in2min3_type.attr,
+	&iio_const_attr_in2min3_index.dev_attr.attr,
 	&iio_scan_el_in4min5.dev_attr.attr,	&dev_attr_in4min5_type.attr,
+	&iio_const_attr_in4min5_index.dev_attr.attr,
 	&iio_scan_el_in6min7.dev_attr.attr,	&dev_attr_in6min7_type.attr,
+	&iio_const_attr_in6min7_index.dev_attr.attr,
 	&iio_scan_el_in1min0.dev_attr.attr,	&dev_attr_in1min0_type.attr,
+	&iio_const_attr_in1min0_index.dev_attr.attr,
 	&iio_scan_el_in3min2.dev_attr.attr,	&dev_attr_in3min2_type.attr,
+	&iio_const_attr_in3min2_index.dev_attr.attr,
 	&iio_scan_el_in5min4.dev_attr.attr,	&dev_attr_in5min4_type.attr,
+	&iio_const_attr_in5min4_index.dev_attr.attr,
 	&iio_scan_el_in7min6.dev_attr.attr,	&dev_attr_in7min6_type.attr,
+	&iio_const_attr_in7min6_index.dev_attr.attr,
+	NULL
 };
 
 static struct attribute_group max11608_scan_el_group = {

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

Reply via email to