summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2011-09-02 16:14:42 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-09-06 23:02:02 (GMT)
commitc04ea8ae99d71182b525cb8e4d48dc2fde0dd0ee (patch)
treee0354b27edf24e594faa1766327f78f07ddb7d1b
parente614a54b296185b266b4bd91193e08a5fbd32422 (diff)
downloadlinux-fsl-qoriq-c04ea8ae99d71182b525cb8e4d48dc2fde0dd0ee.tar.xz
staging:iio:naming in the EV_BIT macro fix.
Should always have been IIO_EV_DIR_MAX as that's what it actually controls. Also reduced the number to 4 as not yet seen a case needing more and this is not userspace visible anyway. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/iio/industrialio-core.c20
-rw-r--r--drivers/staging/iio/sysfs.h4
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index c4985cb..8c054c0 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -791,27 +791,27 @@ static int iio_device_add_event_sysfs(struct iio_dev *dev_info,
for_each_set_bit(i, &chan->event_mask, sizeof(chan->event_mask)*8) {
postfix = kasprintf(GFP_KERNEL, "%s_%s_en",
- iio_ev_type_text[i/IIO_EV_TYPE_MAX],
- iio_ev_dir_text[i%IIO_EV_TYPE_MAX]);
+ iio_ev_type_text[i/IIO_EV_DIR_MAX],
+ iio_ev_dir_text[i%IIO_EV_DIR_MAX]);
if (postfix == NULL) {
ret = -ENOMEM;
goto error_ret;
}
if (chan->modified)
mask = IIO_MOD_EVENT_CODE(chan->type, 0, chan->channel,
- i/IIO_EV_TYPE_MAX,
- i%IIO_EV_TYPE_MAX);
+ i/IIO_EV_DIR_MAX,
+ i%IIO_EV_DIR_MAX);
else if (chan->type == IIO_VOLTAGE_DIFF)
mask = IIO_MOD_EVENT_CODE(chan->type,
chan->channel,
chan->channel2,
- i/IIO_EV_TYPE_MAX,
- i%IIO_EV_TYPE_MAX);
+ i/IIO_EV_DIR_MAX,
+ i%IIO_EV_DIR_MAX);
else
mask = IIO_UNMOD_EVENT_CODE(chan->type,
chan->channel,
- i/IIO_EV_TYPE_MAX,
- i%IIO_EV_TYPE_MAX);
+ i/IIO_EV_DIR_MAX,
+ i%IIO_EV_DIR_MAX);
ret = __iio_add_chan_devattr(postfix,
chan,
@@ -827,8 +827,8 @@ static int iio_device_add_event_sysfs(struct iio_dev *dev_info,
goto error_ret;
attrcount++;
postfix = kasprintf(GFP_KERNEL, "%s_%s_value",
- iio_ev_type_text[i/IIO_EV_TYPE_MAX],
- iio_ev_dir_text[i%IIO_EV_TYPE_MAX]);
+ iio_ev_type_text[i/IIO_EV_DIR_MAX],
+ iio_ev_dir_text[i%IIO_EV_DIR_MAX]);
if (postfix == NULL) {
ret = -ENOMEM;
goto error_ret;
diff --git a/drivers/staging/iio/sysfs.h b/drivers/staging/iio/sysfs.h
index dcb413d..9224f30 100644
--- a/drivers/staging/iio/sysfs.h
+++ b/drivers/staging/iio/sysfs.h
@@ -131,9 +131,9 @@ enum iio_event_direction {
(((u64)type << 56) | ((u64)direction << 48) | ((u64)modifier << 40) | \
((u64)chan_type << 32) | (chan2 << 16) | chan1 | chan)
-#define IIO_EV_TYPE_MAX 8
+#define IIO_EV_DIR_MAX 4
#define IIO_EV_BIT(type, direction) \
- (1 << (type*IIO_EV_TYPE_MAX + direction))
+ (1 << (type*IIO_EV_DIR_MAX + direction))
#define IIO_MOD_EVENT_CODE(channelclass, number, modifier, \
type, direction) \