summaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio/adc
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2010-10-08 12:14:13 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-08 07:17:56 -0700
commit1755b0ae17b95a851f0a8940900ac1e7d5fa8edb (patch)
treee6aee0e16050c12caa3ad96d1c7ca55d94162b76 /drivers/staging/iio/adc
parent2f3cc667f788d97b6e79ef76b89f995598c036a3 (diff)
downloadop-kernel-dev-1755b0ae17b95a851f0a8940900ac1e7d5fa8edb.zip
op-kernel-dev-1755b0ae17b95a851f0a8940900ac1e7d5fa8edb.tar.gz
staging: iio: adc add numbers to naming of all adc channels as needed to associate events with them.
Given event codes are associated by number not name, all adc channels including those with names need to have numbers. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/adc')
-rw-r--r--drivers/staging/iio/adc/adc.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/iio/adc/adc.h b/drivers/staging/iio/adc/adc.h
index 4f13427..40c5949 100644
--- a/drivers/staging/iio/adc/adc.h
+++ b/drivers/staging/iio/adc/adc.h
@@ -16,8 +16,8 @@
#define IIO_DEV_ATTR_IN_RAW(_num, _show, _addr) \
IIO_DEVICE_ATTR(in##_num##_raw, S_IRUGO, _show, NULL, _addr)
-#define IIO_DEV_ATTR_IN_NAMED_RAW(_name, _show, _addr) \
- IIO_DEVICE_ATTR(in_##_name##_raw, S_IRUGO, _show, NULL, _addr)
+#define IIO_DEV_ATTR_IN_NAMED_RAW(_num, _name, _show, _addr) \
+ IIO_DEVICE_ATTR(in##_num##_##_name##_raw, S_IRUGO, _show, NULL, _addr)
#define IIO_DEV_ATTR_IN_DIFF_RAW(_nump, _numn, _show, _addr) \
IIO_DEVICE_ATTR_NAMED(in##_nump##min##_numn##_raw, \
@@ -28,11 +28,11 @@
_addr)
-#define IIO_CONST_ATTR_IN_NAMED_OFFSET(_name, _string) \
- IIO_CONST_ATTR(in_##_name##_offset, _string)
+#define IIO_CONST_ATTR_IN_NAMED_OFFSET(_num, _name, _string) \
+ IIO_CONST_ATTR(in##_num##_##_name##_offset, _string)
-#define IIO_CONST_ATTR_IN_NAMED_SCALE(_name, _string) \
- IIO_CONST_ATTR(in_##_name##_scale, _string)
+#define IIO_CONST_ATTR_IN_NAMED_SCALE(_num, _name, _string) \
+ IIO_CONST_ATTR(in##_num##_##_name##_scale, _string)
#define IIO_EVENT_CODE_IN_HIGH_THRESH(a) \
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, a, IIO_EV_TYPE_THRESH, \
OpenPOWER on IntegriCloud