diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-09-02 16:14:41 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 23:02:01 (GMT) |
| commit | e614a54b296185b266b4bd91193e08a5fbd32422 (patch) | |
| tree | 9f2af9296030fbc80d0766d7ffb7ce52b065b236 | |
| parent | 26d25ae3f0d8ffe350aacc75b71198d6b35bd1f4 (diff) | |
| download | linux-fsl-qoriq-e614a54b296185b266b4bd91193e08a5fbd32422.tar.xz | |
staging:iio:attrs - make address a u64 to allow event codes to be used.
Makes unusual event related attributes look a lot more like the core ones.
V2: Make sure the utils that set these up can handle the codes.
V3: rebase
Reported-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/iio/iio_core.h | 2 | ||||
| -rw-r--r-- | drivers/staging/iio/industrialio-core.c | 5 | ||||
| -rw-r--r-- | drivers/staging/iio/sysfs.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/iio/iio_core.h b/drivers/staging/iio/iio_core.h index 3a80dbf..803bdd8 100644 --- a/drivers/staging/iio/iio_core.h +++ b/drivers/staging/iio/iio_core.h @@ -22,7 +22,7 @@ int __iio_add_chan_devattr(const char *postfix, struct device_attribute *attr, const char *buf, size_t len), - int mask, + u64 mask, bool generic, struct device *dev, struct list_head *attr_list); diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index 49322bf..c4985cb 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c @@ -515,7 +515,7 @@ int __iio_add_chan_devattr(const char *postfix, struct device_attribute *attr, const char *buf, size_t len), - int mask, + u64 mask, bool generic, struct device *dev, struct list_head *attr_list) @@ -783,7 +783,8 @@ static ssize_t iio_ev_value_store(struct device *dev, static int iio_device_add_event_sysfs(struct iio_dev *dev_info, struct iio_chan_spec const *chan) { - int ret = 0, i, mask = 0, attrcount = 0; + int ret = 0, i, attrcount = 0; + u64 mask = 0; char *postfix; if (!chan->event_mask) return 0; diff --git a/drivers/staging/iio/sysfs.h b/drivers/staging/iio/sysfs.h index 30f9a4d..dcb413d 100644 --- a/drivers/staging/iio/sysfs.h +++ b/drivers/staging/iio/sysfs.h @@ -22,7 +22,7 @@ struct iio_chan_spec; */ struct iio_dev_attr { struct device_attribute dev_attr; - int address; + u64 address; struct list_head l; struct iio_chan_spec const *c; }; |