From 98536d2e3791aa7330d80b1c49021b174584b26d Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Fri, 2 Sep 2011 17:14:42 +0100 Subject: [PATCH] --- yaml --- r: 268170 b: refs/heads/master c: c04ea8ae99d71182b525cb8e4d48dc2fde0dd0ee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/industrialio-core.c | 20 +++++++++---------- trunk/drivers/staging/iio/sysfs.h | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 1e21a5bd156d..a3e878b08509 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e614a54b296185b266b4bd91193e08a5fbd32422 +refs/heads/master: c04ea8ae99d71182b525cb8e4d48dc2fde0dd0ee diff --git a/trunk/drivers/staging/iio/industrialio-core.c b/trunk/drivers/staging/iio/industrialio-core.c index c4985cb0947d..8c054c0a715b 100644 --- a/trunk/drivers/staging/iio/industrialio-core.c +++ b/trunk/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/trunk/drivers/staging/iio/sysfs.h b/trunk/drivers/staging/iio/sysfs.h index dcb413de2af6..9224f306fba4 100644 --- a/trunk/drivers/staging/iio/sysfs.h +++ b/trunk/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) \