* [PATCH 0/7] staging:iio: character device merge
@ 2011-08-30 11:32 Jonathan Cameron
2011-08-30 11:32 ` [PATCH 1/7] staging:iio:kfifo buffer - push structure definition down into implementation Jonathan Cameron
` (6 more replies)
0 siblings, 7 replies; 9+ messages in thread
From: Jonathan Cameron @ 2011-08-30 11:32 UTC (permalink / raw)
To: greg; +Cc: linux-iio, Jonathan Cameron
Hi Greg,
This is the first of the more interesting sets for IIO this round.
What we have here is another one of the changes Arnd Bergmann suggested.
(we have nearly caught up with everything in his review!)
It merges all of our character devices per hardware device down into one.
That device supports an ioctl (documentation for that dropped for now
as it would touch a doc file that doesn't have any staging related
elements) that is used to request an anonfd for the event interface.
Anyhow, this has been on linux-iio for quite a while and Michael has been
hammering it with his Analog devices parts without problem hence I'm
sending it on to you now. We need to do some documentation for this
as well and that will follow sometime soon (IIO events were never well
documented in the first place - oops)
Thanks,
Jonathan
Text of pervious posting was:
Hi All,
I thought I'd best give this series one last airing before sending on
to Greg. Note I'll be dropping the ioctl region patch for now as
there may be issues with reserving that for a staging driver?
Anyhow does what it says on the tin.
Michael, can you give me a tested by on this stuff (guessing you have
been given your iio-blue.git fixes etc).
Thanks,
Jonathan
And the one before that:
This is another of Arnd's suggestions.
Some of the patches here are just pre conversion reworks to make the important
bit easier and some are cleanups of headers etc as a result of things not
being needed any more.
One little change I slipped in here:
devices now have iio:deviceX as their name so that we have something
sensibly named under /dev/
The important patches are 4 and 6.
4 uses Arnd's suggestion of an annon_fd obtained via ioctl on the buffer
chrdev to get a file for easy use for reading events. This is a very neat
solution that lets us keep the actual event system separate from the data
stream without two chrdevs.
6. Moves the remaining single chrdev so it associated with the iio_dev rather
than the buffer. This means we now only have two types of device (other than
weird ones like the sysfs trigger management node), triggers and devices.
Given either can exist independently, those two don't make sense to merge.
Anyhow, I'm far from convinced that the allocation / deallocation is now
correct and that there aren't any race conditions on removal od devices.
(then again I'm not convinced there weren't any of those before.)
Note I haven't ammended the nature of either 'chrdev' at all. There
is more to be done there.
Note, this is 3.2 material so no particular rush for comments.
Having said that, please do pull it into local trees and hammer it
nice and hard to see where I messed up.
For reference a minimal test app is:
#include <stdio.h>
/* little dirty test prog */
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <stdint.h>
struct iio_event_data {
int id;
int64_t timestamp;
};
int main(int argc, char **argv)
{
int ret;
int fp;
int data;
int i = 0;
FILE *evfp;
struct iio_event_data ev;
fp = open(argv[1], O_RDONLY);
ret = ioctl(fp, 0, &data);
/* So we have the fd (in theory) of the anon file */
evfp = fdopen(data, "r");
if (evfp)
for (i = 0; i < 100; i++) {
ret = fread( &ev, sizeof(ev), 1, evfp);
printf("%d %lld\n", ev.id, ev.timestamp);
}
return 0;
}
Jonathan
Jonathan Cameron (7):
staging:iio:kfifo buffer - push structure definition down into
implementation.
staging:iio:chrdev.h rationalization.
staging:iio: remove specific chrdev for event reading. Get fd from
ioctl on buffer.
staging:iio: squash chrdev handler remains into users.
staging:iio: push the main buffer chrdev down to the top level.
staging:iio: remove now defunct header definitions and add some
statics
staging:iio:Documentation sysfs-bus-iio update for chrdev merge.
drivers/staging/iio/Documentation/generic_buffer.c | 12 +-
drivers/staging/iio/Documentation/iio_utils.h | 2 +-
drivers/staging/iio/Documentation/sysfs-bus-iio | 573 ++++++++++----------
drivers/staging/iio/accel/adis16201_core.c | 6 +-
drivers/staging/iio/accel/adis16203_core.c | 6 +-
drivers/staging/iio/accel/adis16204_core.c | 6 +-
drivers/staging/iio/accel/adis16209_core.c | 6 +-
drivers/staging/iio/accel/adis16240_core.c | 6 +-
drivers/staging/iio/accel/lis3l02dq_core.c | 6 +-
drivers/staging/iio/accel/sca3000_core.c | 7 +-
drivers/staging/iio/accel/sca3000_ring.c | 23 +-
drivers/staging/iio/adc/ad7150.c | 1 +
drivers/staging/iio/adc/ad7192.c | 6 +-
drivers/staging/iio/adc/ad7298_core.c | 4 +-
drivers/staging/iio/adc/ad7476_core.c | 4 +-
drivers/staging/iio/adc/ad7606_core.c | 4 +-
drivers/staging/iio/adc/ad7745.c | 1 +
drivers/staging/iio/adc/ad7793.c | 6 +-
drivers/staging/iio/adc/ad7816.c | 1 +
drivers/staging/iio/adc/ad7887_core.c | 4 +-
drivers/staging/iio/adc/ad799x_core.c | 6 +-
drivers/staging/iio/adc/adt7310.c | 2 +
drivers/staging/iio/adc/adt7410.c | 2 +
drivers/staging/iio/adc/adt75.c | 1 +
drivers/staging/iio/adc/max1363_core.c | 10 +-
drivers/staging/iio/addac/adt7316.c | 2 +
drivers/staging/iio/chrdev.h | 52 +--
drivers/staging/iio/dac/ad5504.c | 1 +
drivers/staging/iio/gyro/adis16260_core.c | 6 +-
drivers/staging/iio/iio.h | 3 +-
drivers/staging/iio/iio_core.h | 39 +-
drivers/staging/iio/impedance-analyzer/ad5933.c | 8 +-
drivers/staging/iio/imu/adis16400_core.c | 6 +-
drivers/staging/iio/industrialio-core.c | 279 ++++++-----
drivers/staging/iio/industrialio-ring.c | 220 +++-----
drivers/staging/iio/kfifo_buf.c | 34 +-
drivers/staging/iio/kfifo_buf.h | 8 -
drivers/staging/iio/meter/ade7758.h | 5 +-
drivers/staging/iio/meter/ade7758_core.c | 6 +-
drivers/staging/iio/meter/ade7758_ring.c | 4 +-
drivers/staging/iio/ring_generic.h | 28 +-
drivers/staging/iio/ring_sw.c | 25 +-
42 files changed, 644 insertions(+), 787 deletions(-)
--
1.7.3.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/7] staging:iio:kfifo buffer - push structure definition down into implementation. 2011-08-30 11:32 [PATCH 0/7] staging:iio: character device merge Jonathan Cameron @ 2011-08-30 11:32 ` Jonathan Cameron 2011-08-30 11:32 ` [PATCH 2/7] staging:iio:chrdev.h rationalization Jonathan Cameron ` (5 subsequent siblings) 6 siblings, 0 replies; 9+ messages in thread From: Jonathan Cameron @ 2011-08-30 11:32 UTC (permalink / raw) To: greg; +Cc: linux-iio, Jonathan Cameron Nothing other than the implementation needs to know about this. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> --- drivers/staging/iio/kfifo_buf.c | 8 ++++++++ drivers/staging/iio/kfifo_buf.h | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/iio/kfifo_buf.c b/drivers/staging/iio/kfifo_buf.c index 6002368..3c9516b 100644 --- a/drivers/staging/iio/kfifo_buf.c +++ b/drivers/staging/iio/kfifo_buf.c @@ -8,6 +8,14 @@ #include "kfifo_buf.h" +struct iio_kfifo { + struct iio_ring_buffer ring; + struct kfifo kf; + int use_count; + int update_needed; + struct mutex use_lock; +}; + #define iio_to_kfifo(r) container_of(r, struct iio_kfifo, ring) static inline int __iio_allocate_kfifo(struct iio_kfifo *buf, diff --git a/drivers/staging/iio/kfifo_buf.h b/drivers/staging/iio/kfifo_buf.h index aac3053..fb48523 100644 --- a/drivers/staging/iio/kfifo_buf.h +++ b/drivers/staging/iio/kfifo_buf.h @@ -3,14 +3,6 @@ #include "iio.h" #include "ring_generic.h" -struct iio_kfifo { - struct iio_ring_buffer ring; - struct kfifo kf; - int use_count; - int update_needed; - struct mutex use_lock; -}; - extern const struct iio_ring_access_funcs kfifo_access_funcs; struct iio_ring_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev); -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/7] staging:iio:chrdev.h rationalization. 2011-08-30 11:32 [PATCH 0/7] staging:iio: character device merge Jonathan Cameron 2011-08-30 11:32 ` [PATCH 1/7] staging:iio:kfifo buffer - push structure definition down into implementation Jonathan Cameron @ 2011-08-30 11:32 ` Jonathan Cameron 2011-08-30 11:32 ` [PATCH 3/7] staging:iio: remove specific chrdev for event reading. Get fd from ioctl on buffer Jonathan Cameron ` (4 subsequent siblings) 6 siblings, 0 replies; 9+ messages in thread From: Jonathan Cameron @ 2011-08-30 11:32 UTC (permalink / raw) To: greg; +Cc: linux-iio, Jonathan Cameron Push some functions out of header and include this where it is needed in other headers only. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> --- drivers/staging/iio/chrdev.h | 32 ------------------------------- drivers/staging/iio/iio.h | 2 +- drivers/staging/iio/industrialio-core.c | 32 +++++++++++++++++++++++++++++++ drivers/staging/iio/ring_generic.h | 1 + 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/drivers/staging/iio/chrdev.h b/drivers/staging/iio/chrdev.h index 3e31ee6..8a229e7 100644 --- a/drivers/staging/iio/chrdev.h +++ b/drivers/staging/iio/chrdev.h @@ -9,7 +9,6 @@ #ifndef _IIO_CHRDEV_H_ #define _IIO_CHRDEV_H_ -struct iio_dev; /** * struct iio_handler - Structure used to specify file operations @@ -41,35 +40,4 @@ struct iio_event_data { s64 timestamp; }; -/** - * struct iio_detected_event_list - list element for events that have occurred - * @list: linked list header - * @ev: the event itself - */ -struct iio_detected_event_list { - struct list_head list; - struct iio_event_data ev; -}; - -/** - * struct iio_event_interface - chrdev interface for an event line - * @dev: device assocated with event interface - * @handler: fileoperations and related control for the chrdev - * @wait: wait queue to allow blocking reads of events - * @event_list_lock: mutex to protect the list of detected events - * @det_events: list of detected events - * @max_events: maximum number of events before new ones are dropped - * @current_events: number of events in detected list - */ -struct iio_event_interface { - struct device dev; - struct iio_handler handler; - wait_queue_head_t wait; - struct mutex event_list_lock; - struct list_head det_events; - int max_events; - int current_events; - struct list_head dev_attr_list; -}; - #endif diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h index 753f769..cfa1480 100644 --- a/drivers/staging/iio/iio.h +++ b/drivers/staging/iio/iio.h @@ -15,7 +15,6 @@ #include <linux/cdev.h> #include <linux/irq.h> #include "sysfs.h" -#include "chrdev.h" /* IIO TODO LIST */ /* @@ -178,6 +177,7 @@ static inline s64 iio_get_time_ns(void) #define IIO_VAL_INT_PLUS_NANO 3 struct iio_trigger; /* forward declaration */ +struct iio_dev; /** * struct iio_info - constant information about device diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index ed8a6df..8a21c5e 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c @@ -24,6 +24,7 @@ #include "iio.h" #include "iio_core.h" #include "iio_core_trigger.h" +#include "chrdev.h" #define IIO_ID_PREFIX "device" #define IIO_ID_FORMAT IIO_ID_PREFIX "%d" @@ -117,6 +118,37 @@ static void iio_free_ida_val(struct ida *this_ida, int id) spin_unlock(&iio_ida_lock); } +/** + * struct iio_detected_event_list - list element for events that have occurred + * @list: linked list header + * @ev: the event itself + */ +struct iio_detected_event_list { + struct list_head list; + struct iio_event_data ev; +}; + +/** + * struct iio_event_interface - chrdev interface for an event line + * @dev: device assocated with event interface + * @handler: fileoperations and related control for the chrdev + * @wait: wait queue to allow blocking reads of events + * @event_list_lock: mutex to protect the list of detected events + * @det_events: list of detected events + * @max_events: maximum number of events before new ones are dropped + * @current_events: number of events in detected list + */ +struct iio_event_interface { + struct device dev; + struct iio_handler handler; + wait_queue_head_t wait; + struct mutex event_list_lock; + struct list_head det_events; + int max_events; + int current_events; + struct list_head dev_attr_list; +}; + int iio_push_event(struct iio_dev *dev_info, int ev_line, int ev_code, diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h index 3f26f71..d103262 100644 --- a/drivers/staging/iio/ring_generic.h +++ b/drivers/staging/iio/ring_generic.h @@ -10,6 +10,7 @@ #ifndef _IIO_RING_GENERIC_H_ #define _IIO_RING_GENERIC_H_ #include "iio.h" +#include "chrdev.h" #ifdef CONFIG_IIO_RING_BUFFER -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/7] staging:iio: remove specific chrdev for event reading. Get fd from ioctl on buffer. 2011-08-30 11:32 [PATCH 0/7] staging:iio: character device merge Jonathan Cameron 2011-08-30 11:32 ` [PATCH 1/7] staging:iio:kfifo buffer - push structure definition down into implementation Jonathan Cameron 2011-08-30 11:32 ` [PATCH 2/7] staging:iio:chrdev.h rationalization Jonathan Cameron @ 2011-08-30 11:32 ` Jonathan Cameron 2011-08-30 11:32 ` [PATCH 4/7] staging:iio: squash chrdev handler remains into users Jonathan Cameron ` (3 subsequent siblings) 6 siblings, 0 replies; 9+ messages in thread From: Jonathan Cameron @ 2011-08-30 11:32 UTC (permalink / raw) To: greg; +Cc: linux-iio, Jonathan Cameron Change suggested by Arnd Bergmann. No real reason to have two chrdevs per device. This step merges them into one. Currently this means that events will only work on devices with buffers. THat will be remedied shortly. V2: set name for event attribute groups. Otherwise they all sorts of fun occurs on dynamic channel event attribute creation. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> --- drivers/staging/iio/accel/sca3000_core.c | 1 + drivers/staging/iio/adc/ad7150.c | 1 + drivers/staging/iio/adc/ad7745.c | 1 + drivers/staging/iio/adc/ad7816.c | 1 + drivers/staging/iio/adc/ad799x_core.c | 2 + drivers/staging/iio/adc/adt7310.c | 2 + drivers/staging/iio/adc/adt7410.c | 2 + drivers/staging/iio/adc/adt75.c | 1 + drivers/staging/iio/adc/max1363_core.c | 4 +- drivers/staging/iio/addac/adt7316.c | 2 + drivers/staging/iio/chrdev.h | 1 + drivers/staging/iio/dac/ad5504.c | 1 + drivers/staging/iio/iio.h | 1 + drivers/staging/iio/industrialio-core.c | 174 ++++++++++-------------------- drivers/staging/iio/industrialio-ring.c | 21 ++++ 15 files changed, 98 insertions(+), 117 deletions(-) diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c index dbf1622..d7f79b4 100644 --- a/drivers/staging/iio/accel/sca3000_core.c +++ b/drivers/staging/iio/accel/sca3000_core.c @@ -1036,6 +1036,7 @@ static struct attribute *sca3000_event_attributes[] = { static struct attribute_group sca3000_event_attribute_group = { .attrs = sca3000_event_attributes, + .name = "events", }; /** diff --git a/drivers/staging/iio/adc/ad7150.c b/drivers/staging/iio/adc/ad7150.c index c01acbc..9fd1087 100644 --- a/drivers/staging/iio/adc/ad7150.c +++ b/drivers/staging/iio/adc/ad7150.c @@ -700,6 +700,7 @@ static struct attribute *ad7150_event_attributes[] = { static struct attribute_group ad7150_event_attribute_group = { .attrs = ad7150_event_attributes, + .name = "events", }; static const struct iio_info ad7150_info = { diff --git a/drivers/staging/iio/adc/ad7745.c b/drivers/staging/iio/adc/ad7745.c index 91d598c..414e6dd 100644 --- a/drivers/staging/iio/adc/ad7745.c +++ b/drivers/staging/iio/adc/ad7745.c @@ -563,6 +563,7 @@ static struct attribute *ad774x_event_attributes[] = { static struct attribute_group ad774x_event_attribute_group = { .attrs = ad774x_event_attributes, + .name = "events", }; static const struct iio_info ad774x_info = { diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c index f5aa57b..8104ef4 100644 --- a/drivers/staging/iio/adc/ad7816.c +++ b/drivers/staging/iio/adc/ad7816.c @@ -329,6 +329,7 @@ static struct attribute *ad7816_event_attributes[] = { static struct attribute_group ad7816_event_attribute_group = { .attrs = ad7816_event_attributes, + .name = "events", }; static const struct iio_info ad7816_info = { diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c index 33e4e21..f1b044b 100644 --- a/drivers/staging/iio/adc/ad799x_core.c +++ b/drivers/staging/iio/adc/ad799x_core.c @@ -447,6 +447,7 @@ static struct attribute *ad7993_4_7_8_event_attributes[] = { static struct attribute_group ad7993_4_7_8_event_attrs_group = { .attrs = ad7993_4_7_8_event_attributes, + .name = "events", }; static struct attribute *ad7992_event_attributes[] = { @@ -463,6 +464,7 @@ static struct attribute *ad7992_event_attributes[] = { static struct attribute_group ad7992_event_attrs_group = { .attrs = ad7992_event_attributes, + .name = "events", }; static const struct iio_info ad7991_info = { diff --git a/drivers/staging/iio/adc/adt7310.c b/drivers/staging/iio/adc/adt7310.c index 697ad1b..b55066f 100644 --- a/drivers/staging/iio/adc/adt7310.c +++ b/drivers/staging/iio/adc/adt7310.c @@ -741,8 +741,10 @@ static struct attribute *adt7310_event_ct_attributes[] = { static struct attribute_group adt7310_event_attribute_group[ADT7310_IRQS] = { { .attrs = adt7310_event_int_attributes, + .name = "events", }, { .attrs = adt7310_event_ct_attributes, + .name = "events", } }; diff --git a/drivers/staging/iio/adc/adt7410.c b/drivers/staging/iio/adc/adt7410.c index b7631f1..2e56ae8 100644 --- a/drivers/staging/iio/adc/adt7410.c +++ b/drivers/staging/iio/adc/adt7410.c @@ -708,8 +708,10 @@ static struct attribute *adt7410_event_ct_attributes[] = { static struct attribute_group adt7410_event_attribute_group[ADT7410_IRQS] = { { .attrs = adt7410_event_int_attributes, + .name = "events", }, { .attrs = adt7410_event_ct_attributes, + .name = "events", } }; diff --git a/drivers/staging/iio/adc/adt75.c b/drivers/staging/iio/adc/adt75.c index dd78277..66c5000 100644 --- a/drivers/staging/iio/adc/adt75.c +++ b/drivers/staging/iio/adc/adt75.c @@ -530,6 +530,7 @@ static struct attribute *adt75_event_attributes[] = { static struct attribute_group adt75_event_attribute_group = { .attrs = adt75_event_attributes, + .name = "events", }; static const struct iio_info adt75_info = { diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c index e10a4d8..0bf7b74 100644 --- a/drivers/staging/iio/adc/max1363_core.c +++ b/drivers/staging/iio/adc/max1363_core.c @@ -827,6 +827,7 @@ static struct attribute *max1363_event_attributes[] = { static struct attribute_group max1363_event_attribute_group = { .attrs = max1363_event_attributes, + .name = "events", }; #define MAX1363_EVENT_FUNCS \ @@ -1296,7 +1297,8 @@ static int __devinit max1363_probe(struct i2c_client *client, /* Estabilish that the iio_dev is a child of the i2c device */ indio_dev->dev.parent = &client->dev; indio_dev->name = id->name; - + indio_dev->channels = st->chip_info->channels; + indio_dev->num_channels = st->chip_info->num_channels; indio_dev->info = st->chip_info->info; indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->channels = st->chip_info->channels; diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c index 474d946..dca43a7 100644 --- a/drivers/staging/iio/addac/adt7316.c +++ b/drivers/staging/iio/addac/adt7316.c @@ -2064,6 +2064,7 @@ static struct attribute *adt7316_event_attributes[] = { static struct attribute_group adt7316_event_attribute_group = { .attrs = adt7316_event_attributes, + .name = "events", }; static struct attribute *adt7516_event_attributes[] = { @@ -2084,6 +2085,7 @@ static struct attribute *adt7516_event_attributes[] = { static struct attribute_group adt7516_event_attribute_group = { .attrs = adt7516_event_attributes, + .name = "events", }; #ifdef CONFIG_PM diff --git a/drivers/staging/iio/chrdev.h b/drivers/staging/iio/chrdev.h index 8a229e7..c6bd04c 100644 --- a/drivers/staging/iio/chrdev.h +++ b/drivers/staging/iio/chrdev.h @@ -40,4 +40,5 @@ struct iio_event_data { s64 timestamp; }; +#define IIO_GET_EVENT_FD_IOCTL _IOR('i', 0x90, int) #endif diff --git a/drivers/staging/iio/dac/ad5504.c b/drivers/staging/iio/dac/ad5504.c index 5243ef9..5fb2106 100644 --- a/drivers/staging/iio/dac/ad5504.c +++ b/drivers/staging/iio/dac/ad5504.c @@ -247,6 +247,7 @@ static struct attribute *ad5504_ev_attributes[] = { static struct attribute_group ad5504_ev_attribute_group = { .attrs = ad5504_ev_attributes, + .name = "events", }; static irqreturn_t ad5504_event_handler(int irq, void *private) diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h index cfa1480..5b61a7e 100644 --- a/drivers/staging/iio/iio.h +++ b/drivers/staging/iio/iio.h @@ -245,6 +245,7 @@ struct iio_info { }; +int iio_event_getfd(struct iio_dev *indio_dev); /** * struct iio_dev - industrial I/O device * @id: [INTERN] used to identify device internally diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index 8a21c5e..a6ea962 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c @@ -21,6 +21,7 @@ #include <linux/wait.h> #include <linux/cdev.h> #include <linux/slab.h> +#include <linux/anon_inodes.h> #include "iio.h" #include "iio_core.h" #include "iio_core_trigger.h" @@ -128,6 +129,7 @@ struct iio_detected_event_list { struct iio_event_data ev; }; + /** * struct iio_event_interface - chrdev interface for an event line * @dev: device assocated with event interface @@ -139,7 +141,6 @@ struct iio_detected_event_list { * @current_events: number of events in detected list */ struct iio_event_interface { - struct device dev; struct iio_handler handler; wait_queue_head_t wait; struct mutex event_list_lock; @@ -187,7 +188,6 @@ error_ret: } EXPORT_SYMBOL(iio_push_event); - /* This turns up an awful lot */ ssize_t iio_read_const_attr(struct device *dev, struct device_attribute *attr, @@ -207,7 +207,6 @@ static ssize_t iio_event_chrdev_read(struct file *filep, struct iio_detected_event_list *el; int ret; size_t len; - mutex_lock(&ev_int->event_list_lock); if (list_empty(&ev_int->det_events)) { if (filep->f_flags & O_NONBLOCK) { @@ -249,10 +248,8 @@ error_ret: static int iio_event_chrdev_release(struct inode *inode, struct file *filep) { - struct iio_handler *hand = iio_cdev_to_handler(inode->i_cdev); - struct iio_event_interface *ev_int = hand->private; + struct iio_event_interface *ev_int = filep->private_data; struct iio_detected_event_list *el, *t; - mutex_lock(&ev_int->event_list_lock); clear_bit(IIO_BUSY_BIT_POS, &ev_int->handler.flags); /* @@ -264,23 +261,7 @@ static int iio_event_chrdev_release(struct inode *inode, struct file *filep) list_del(&el->list); kfree(el); } - mutex_unlock(&ev_int->event_list_lock); - - return 0; -} - -static int iio_event_chrdev_open(struct inode *inode, struct file *filep) -{ - struct iio_handler *hand = iio_cdev_to_handler(inode->i_cdev); - struct iio_event_interface *ev_int = hand->private; - - mutex_lock(&ev_int->event_list_lock); - if (test_and_set_bit(IIO_BUSY_BIT_POS, &hand->flags)) { - fops_put(filep->f_op); - mutex_unlock(&ev_int->event_list_lock); - return -EBUSY; - } - filep->private_data = hand->private; + ev_int->current_events = 0; mutex_unlock(&ev_int->event_list_lock); return 0; @@ -289,23 +270,10 @@ static int iio_event_chrdev_open(struct inode *inode, struct file *filep) static const struct file_operations iio_event_chrdev_fileops = { .read = iio_event_chrdev_read, .release = iio_event_chrdev_release, - .open = iio_event_chrdev_open, .owner = THIS_MODULE, .llseek = noop_llseek, }; -static void iio_event_dev_release(struct device *dev) -{ - struct iio_event_interface *ev_int - = container_of(dev, struct iio_event_interface, dev); - cdev_del(&ev_int->handler.chrdev); - iio_device_free_chrdev_minor(MINOR(dev->devt)); -}; - -static struct device_type iio_event_type = { - .release = iio_event_dev_release, -}; - int iio_device_get_chrdev_minor(void) { int ret; @@ -322,34 +290,29 @@ void iio_device_free_chrdev_minor(int val) iio_free_ida_val(&iio_chrdev_ida, val); } -static int iio_setup_ev_int(struct iio_event_interface *ev_int, +int iio_event_getfd(struct iio_dev *indio_dev) +{ + if (indio_dev->event_interfaces == NULL) + return -ENODEV; + + mutex_lock(&indio_dev->event_interfaces->event_list_lock); + if (test_and_set_bit(IIO_BUSY_BIT_POS, + &indio_dev->event_interfaces->handler.flags)) { + mutex_unlock(&indio_dev->event_interfaces->event_list_lock); + return -EBUSY; + } + mutex_unlock(&indio_dev->event_interfaces->event_list_lock); + return anon_inode_getfd("iio:event", + &iio_event_chrdev_fileops, + &indio_dev->event_interfaces[0], O_RDONLY); +} + +static void iio_setup_ev_int(struct iio_event_interface *ev_int, const char *dev_name, int index, struct module *owner, struct device *dev) { - int ret, minor; - - ev_int->dev.bus = &iio_bus_type; - ev_int->dev.parent = dev; - ev_int->dev.type = &iio_event_type; - device_initialize(&ev_int->dev); - - minor = iio_device_get_chrdev_minor(); - if (minor < 0) { - ret = minor; - goto error_device_put; - } - ev_int->dev.devt = MKDEV(MAJOR(iio_devt), minor); - dev_set_name(&ev_int->dev, "%s:event%d", dev_name, index); - - ret = device_add(&ev_int->dev); - if (ret) - goto error_free_minor; - - cdev_init(&ev_int->handler.chrdev, &iio_event_chrdev_fileops); - ev_int->handler.chrdev.owner = owner; - mutex_init(&ev_int->event_list_lock); /* discussion point - make this variable? */ ev_int->max_events = 10; @@ -358,27 +321,6 @@ static int iio_setup_ev_int(struct iio_event_interface *ev_int, init_waitqueue_head(&ev_int->wait); ev_int->handler.private = ev_int; ev_int->handler.flags = 0; - - ret = cdev_add(&ev_int->handler.chrdev, ev_int->dev.devt, 1); - if (ret) - goto error_unreg_device; - - return 0; - -error_unreg_device: - device_unregister(&ev_int->dev); -error_free_minor: - iio_device_free_chrdev_minor(minor); -error_device_put: - put_device(&ev_int->dev); - - return ret; -} - -static void iio_free_ev_int(struct iio_event_interface *ev_int) -{ - device_unregister(&ev_int->dev); - put_device(&ev_int->dev); } static int __init iio_init(void) @@ -970,7 +912,7 @@ static int iio_device_add_event_sysfs(struct iio_dev *dev_info, continue; } ret = __iio_add_chan_devattr(postfix, - NULL, + "events", chan, &iio_ev_state_show, iio_ev_state_store, @@ -980,7 +922,7 @@ static int iio_device_add_event_sysfs(struct iio_dev *dev_info, extending the bitmask - but how far*/ 0, - &dev_info->event_interfaces[0].dev, + &dev_info->dev, &dev_info->event_interfaces[0]. dev_attr_list); kfree(postfix); @@ -994,13 +936,12 @@ static int iio_device_add_event_sysfs(struct iio_dev *dev_info, ret = -ENOMEM; goto error_ret; } - ret = __iio_add_chan_devattr(postfix, NULL, chan, + ret = __iio_add_chan_devattr(postfix, "events", chan, iio_ev_value_show, iio_ev_value_store, mask, 0, - &dev_info->event_interfaces[0] - .dev, + &dev_info->dev, &dev_info->event_interfaces[0] .dev_attr_list); kfree(postfix); @@ -1020,8 +961,7 @@ static inline void __iio_remove_event_config_attrs(struct iio_dev *dev_info, list_for_each_entry_safe(p, n, &dev_info->event_interfaces[i]. dev_attr_list, l) { - sysfs_remove_file_from_group(&dev_info - ->event_interfaces[i].dev.kobj, + sysfs_remove_file_from_group(&dev_info->dev.kobj, &p->dev_attr.attr, NULL); kfree(p->dev_attr.attr.name); @@ -1052,6 +992,15 @@ error_clear_attrs: return ret; } +static struct attribute *iio_events_dummy_attrs[] = { + NULL +}; + +static struct attribute_group iio_events_dummy_group = { + .name = "events", + .attrs = iio_events_dummy_attrs +}; + static int iio_device_register_eventset(struct iio_dev *dev_info) { int ret = 0, i, j; @@ -1069,42 +1018,33 @@ static int iio_device_register_eventset(struct iio_dev *dev_info) } for (i = 0; i < dev_info->info->num_interrupt_lines; i++) { - ret = iio_setup_ev_int(&dev_info->event_interfaces[i], - dev_name(&dev_info->dev), - i, - dev_info->info->driver_module, - &dev_info->dev); - if (ret) { - dev_err(&dev_info->dev, - "Could not get chrdev interface\n"); - goto error_free_setup_event_lines; - } - - dev_set_drvdata(&dev_info->event_interfaces[i].dev, - (void *)dev_info); + iio_setup_ev_int(&dev_info->event_interfaces[i], + dev_name(&dev_info->dev), + i, + dev_info->info->driver_module, + &dev_info->dev); if (dev_info->info->event_attrs != NULL) - ret = sysfs_create_group(&dev_info - ->event_interfaces[i] - .dev.kobj, + ret = sysfs_create_group(&dev_info->dev.kobj, &dev_info->info ->event_attrs[i]); - + else + ret = sysfs_create_group(&dev_info->dev.kobj, + &iio_events_dummy_group); if (ret) { dev_err(&dev_info->dev, "Failed to register sysfs for event attrs"); - iio_free_ev_int(&dev_info->event_interfaces[i]); goto error_free_setup_event_lines; } ret = __iio_add_event_config_attrs(dev_info, i); if (ret) { if (dev_info->info->event_attrs != NULL) - sysfs_remove_group(&dev_info - ->event_interfaces[i] - .dev.kobj, + sysfs_remove_group(&dev_info->dev.kobj, &dev_info->info ->event_attrs[i]); - iio_free_ev_int(&dev_info->event_interfaces[i]); + else + sysfs_remove_group(&dev_info->dev.kobj, + &iio_events_dummy_group); goto error_free_setup_event_lines; } } @@ -1114,11 +1054,12 @@ static int iio_device_register_eventset(struct iio_dev *dev_info) error_free_setup_event_lines: for (j = 0; j < i; j++) { __iio_remove_event_config_attrs(dev_info, j); - if (dev_info->info->event_attrs != NULL) - sysfs_remove_group(&dev_info - ->event_interfaces[j].dev.kobj, + if (dev_info->info->event_attrs != NULL) { + sysfs_remove_group(&dev_info->dev.kobj, &dev_info->info->event_attrs[j]); - iio_free_ev_int(&dev_info->event_interfaces[j]); + sysfs_remove_group(&dev_info->dev.kobj, + &iio_events_dummy_group); + } } kfree(dev_info->event_interfaces); error_ret: @@ -1135,10 +1076,11 @@ static void iio_device_unregister_eventset(struct iio_dev *dev_info) for (i = 0; i < dev_info->info->num_interrupt_lines; i++) { __iio_remove_event_config_attrs(dev_info, i); if (dev_info->info->event_attrs != NULL) - sysfs_remove_group(&dev_info - ->event_interfaces[i].dev.kobj, + sysfs_remove_group(&dev_info->dev.kobj, &dev_info->info->event_attrs[i]); - iio_free_ev_int(&dev_info->event_interfaces[i]); + else + sysfs_remove_group(&dev_info->dev.kobj, + &iio_events_dummy_group); } kfree(dev_info->event_interfaces); } diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c index dce50b1..e4554be 100644 --- a/drivers/staging/iio/industrialio-ring.c +++ b/drivers/staging/iio/industrialio-ring.c @@ -93,6 +93,25 @@ static unsigned int iio_ring_poll(struct file *filp, return 0; } +/* Somewhat of a cross file organization violation - ioctls here are actually + * event related */ +static long iio_ioctl(struct file *f, unsigned int cmd, unsigned long arg) +{ + + struct iio_ring_buffer *rb = f->private_data; + struct iio_dev *indio_dev = rb->indio_dev; + int __user *ip = (int __user *)arg; + + if (cmd == IIO_GET_EVENT_FD_IOCTL) { + int fd; + fd = iio_event_getfd(indio_dev); + if (copy_to_user(ip, &fd, sizeof(fd))) + return -EFAULT; + return 0; + } + return -EINVAL; +} + static const struct file_operations iio_ring_fileops = { .read = iio_ring_read_first_n_outer, .release = iio_ring_release, @@ -100,6 +119,8 @@ static const struct file_operations iio_ring_fileops = { .poll = iio_ring_poll, .owner = THIS_MODULE, .llseek = noop_llseek, + .unlocked_ioctl = iio_ioctl, + .compat_ioctl = iio_ioctl, }; void iio_ring_access_release(struct device *dev) -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/7] staging:iio: squash chrdev handler remains into users. 2011-08-30 11:32 [PATCH 0/7] staging:iio: character device merge Jonathan Cameron ` (2 preceding siblings ...) 2011-08-30 11:32 ` [PATCH 3/7] staging:iio: remove specific chrdev for event reading. Get fd from ioctl on buffer Jonathan Cameron @ 2011-08-30 11:32 ` Jonathan Cameron 2011-08-30 11:32 ` [PATCH 5/7] staging:iio: push the main buffer chrdev down to the top level Jonathan Cameron ` (2 subsequent siblings) 6 siblings, 0 replies; 9+ messages in thread From: Jonathan Cameron @ 2011-08-30 11:32 UTC (permalink / raw) To: greg; +Cc: linux-iio, Jonathan Cameron This no longer has any purpose given all chrdevs are pretty much the same now the event interfaces are done via anon fds Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> --- drivers/staging/iio/chrdev.h | 19 ------------------- drivers/staging/iio/industrialio-core.c | 29 ++++++++++------------------- drivers/staging/iio/industrialio-ring.c | 28 +++++++++++++--------------- drivers/staging/iio/ring_generic.h | 5 +++-- 4 files changed, 26 insertions(+), 55 deletions(-) diff --git a/drivers/staging/iio/chrdev.h b/drivers/staging/iio/chrdev.h index c6bd04c..28cce12 100644 --- a/drivers/staging/iio/chrdev.h +++ b/drivers/staging/iio/chrdev.h @@ -11,25 +11,6 @@ #define _IIO_CHRDEV_H_ /** - * struct iio_handler - Structure used to specify file operations - * for a particular chrdev - * @chrdev: character device structure - * @id: the location in the handler table - used for deallocation. - * @flags: file operations related flags including busy flag. - * @private: handler specific data used by the fileops registered with - * the chrdev. - */ -struct iio_handler { - struct cdev chrdev; - int id; - unsigned long flags; - void *private; -}; - -#define iio_cdev_to_handler(cd) \ - container_of(cd, struct iio_handler, chrdev) - -/** * struct iio_event_data - The actual event being pushed to userspace * @id: event identifier * @timestamp: best estimate of time of event occurrence (often from diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index a6ea962..2b72398 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c @@ -129,25 +129,24 @@ struct iio_detected_event_list { struct iio_event_data ev; }; - /** * struct iio_event_interface - chrdev interface for an event line * @dev: device assocated with event interface - * @handler: fileoperations and related control for the chrdev * @wait: wait queue to allow blocking reads of events * @event_list_lock: mutex to protect the list of detected events * @det_events: list of detected events * @max_events: maximum number of events before new ones are dropped * @current_events: number of events in detected list + * @flags: file operations related flags including busy flag. */ struct iio_event_interface { - struct iio_handler handler; wait_queue_head_t wait; struct mutex event_list_lock; struct list_head det_events; int max_events; int current_events; struct list_head dev_attr_list; + unsigned long flags; }; int iio_push_event(struct iio_dev *dev_info, @@ -162,7 +161,7 @@ int iio_push_event(struct iio_dev *dev_info, /* Does anyone care? */ mutex_lock(&ev_int->event_list_lock); - if (test_bit(IIO_BUSY_BIT_POS, &ev_int->handler.flags)) { + if (test_bit(IIO_BUSY_BIT_POS, &ev_int->flags)) { if (ev_int->current_events == ev_int->max_events) { mutex_unlock(&ev_int->event_list_lock); return 0; @@ -188,6 +187,7 @@ error_ret: } EXPORT_SYMBOL(iio_push_event); + /* This turns up an awful lot */ ssize_t iio_read_const_attr(struct device *dev, struct device_attribute *attr, @@ -207,6 +207,7 @@ static ssize_t iio_event_chrdev_read(struct file *filep, struct iio_detected_event_list *el; int ret; size_t len; + mutex_lock(&ev_int->event_list_lock); if (list_empty(&ev_int->det_events)) { if (filep->f_flags & O_NONBLOCK) { @@ -250,8 +251,9 @@ static int iio_event_chrdev_release(struct inode *inode, struct file *filep) { struct iio_event_interface *ev_int = filep->private_data; struct iio_detected_event_list *el, *t; + mutex_lock(&ev_int->event_list_lock); - clear_bit(IIO_BUSY_BIT_POS, &ev_int->handler.flags); + clear_bit(IIO_BUSY_BIT_POS, &ev_int->flags); /* * In order to maintain a clean state for reopening, * clear out any awaiting events. The mask will prevent @@ -297,7 +299,7 @@ int iio_event_getfd(struct iio_dev *indio_dev) mutex_lock(&indio_dev->event_interfaces->event_list_lock); if (test_and_set_bit(IIO_BUSY_BIT_POS, - &indio_dev->event_interfaces->handler.flags)) { + &indio_dev->event_interfaces->flags)) { mutex_unlock(&indio_dev->event_interfaces->event_list_lock); return -EBUSY; } @@ -307,11 +309,7 @@ int iio_event_getfd(struct iio_dev *indio_dev) &indio_dev->event_interfaces[0], O_RDONLY); } -static void iio_setup_ev_int(struct iio_event_interface *ev_int, - const char *dev_name, - int index, - struct module *owner, - struct device *dev) +static void iio_setup_ev_int(struct iio_event_interface *ev_int) { mutex_init(&ev_int->event_list_lock); /* discussion point - make this variable? */ @@ -319,8 +317,6 @@ static void iio_setup_ev_int(struct iio_event_interface *ev_int, ev_int->current_events = 0; INIT_LIST_HEAD(&ev_int->det_events); init_waitqueue_head(&ev_int->wait); - ev_int->handler.private = ev_int; - ev_int->handler.flags = 0; } static int __init iio_init(void) @@ -1018,12 +1014,7 @@ static int iio_device_register_eventset(struct iio_dev *dev_info) } for (i = 0; i < dev_info->info->num_interrupt_lines; i++) { - iio_setup_ev_int(&dev_info->event_interfaces[i], - dev_name(&dev_info->dev), - i, - dev_info->info->driver_module, - &dev_info->dev); - + iio_setup_ev_int(&dev_info->event_interfaces[i]); if (dev_info->info->event_attrs != NULL) ret = sysfs_create_group(&dev_info->dev.kobj, &dev_info->info diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c index e4554be..cce02244 100644 --- a/drivers/staging/iio/industrialio-ring.c +++ b/drivers/staging/iio/industrialio-ring.c @@ -32,11 +32,10 @@ **/ static int iio_ring_open(struct inode *inode, struct file *filp) { - struct iio_handler *hand - = container_of(inode->i_cdev, struct iio_handler, chrdev); - struct iio_ring_buffer *rb = hand->private; - - filp->private_data = hand->private; + struct iio_ring_buffer *rb + = container_of(inode->i_cdev, + struct iio_ring_buffer, chrdev); + filp->private_data = rb; if (rb->access->mark_in_use) rb->access->mark_in_use(rb); @@ -51,11 +50,11 @@ static int iio_ring_open(struct inode *inode, struct file *filp) **/ static int iio_ring_release(struct inode *inode, struct file *filp) { - struct cdev *cd = inode->i_cdev; - struct iio_handler *hand = iio_cdev_to_handler(cd); - struct iio_ring_buffer *rb = hand->private; + struct iio_ring_buffer *rb + = container_of(inode->i_cdev, + struct iio_ring_buffer, chrdev); - clear_bit(IIO_BUSY_BIT_POS, &rb->access_handler.flags); + clear_bit(IIO_BUSY_BIT_POS, &rb->flags); if (rb->access->unmark_in_use) rb->access->unmark_in_use(rb); @@ -127,7 +126,7 @@ void iio_ring_access_release(struct device *dev) { struct iio_ring_buffer *buf = container_of(dev, struct iio_ring_buffer, dev); - cdev_del(&buf->access_handler.chrdev); + cdev_del(&buf->chrdev); iio_device_free_chrdev_minor(MINOR(dev->devt)); } EXPORT_SYMBOL(iio_ring_access_release); @@ -139,7 +138,7 @@ __iio_request_ring_buffer_chrdev(struct iio_ring_buffer *buf, { int ret; - buf->access_handler.flags = 0; + buf->flags = 0; buf->dev.bus = &iio_bus_type; device_initialize(&buf->dev); @@ -156,9 +155,9 @@ __iio_request_ring_buffer_chrdev(struct iio_ring_buffer *buf, printk(KERN_ERR "failed to add the ring dev\n"); goto error_device_put; } - cdev_init(&buf->access_handler.chrdev, &iio_ring_fileops); - buf->access_handler.chrdev.owner = owner; - ret = cdev_add(&buf->access_handler.chrdev, buf->dev.devt, 1); + cdev_init(&buf->chrdev, &iio_ring_fileops); + buf->chrdev.owner = owner; + ret = cdev_add(&buf->chrdev, buf->dev.devt, 1); if (ret) { printk(KERN_ERR "failed to allocate ring chrdev\n"); goto error_device_unregister; @@ -182,7 +181,6 @@ void iio_ring_buffer_init(struct iio_ring_buffer *ring, struct iio_dev *dev_info) { ring->indio_dev = dev_info; - ring->access_handler.private = ring; init_waitqueue_head(&ring->pollq); } EXPORT_SYMBOL(iio_ring_buffer_init); diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h index d103262..81bbe39 100644 --- a/drivers/staging/iio/ring_generic.h +++ b/drivers/staging/iio/ring_generic.h @@ -85,13 +85,13 @@ struct iio_ring_setup_ops { * @scan_count: [INTERN] the number of elements in the current scan mode * @scan_mask: [INTERN] bitmask used in masking scan mode elements * @scan_timestamp: [INTERN] does the scan mode include a timestamp - * @access_handler: [INTERN] chrdev access handling * @access: [DRIVER] ring access functions associated with the * implementation. * @preenable: [DRIVER] function to run prior to marking ring enabled * @postenable: [DRIVER] function to run after marking ring enabled * @predisable: [DRIVER] function to run prior to marking ring disabled * @postdisable: [DRIVER] function to run after marking ring disabled + * @flags: [INTERN] file ops related flags including busy flag. **/ struct iio_ring_buffer { struct device dev; @@ -104,13 +104,14 @@ struct iio_ring_buffer { int scan_count; unsigned long scan_mask; bool scan_timestamp; - struct iio_handler access_handler; const struct iio_ring_access_funcs *access; const struct iio_ring_setup_ops *setup_ops; struct list_head scan_el_dev_attr_list; wait_queue_head_t pollq; bool stufftoread; + unsigned long flags; + struct cdev chrdev; }; /** -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/7] staging:iio: push the main buffer chrdev down to the top level. 2011-08-30 11:32 [PATCH 0/7] staging:iio: character device merge Jonathan Cameron ` (3 preceding siblings ...) 2011-08-30 11:32 ` [PATCH 4/7] staging:iio: squash chrdev handler remains into users Jonathan Cameron @ 2011-08-30 11:32 ` Jonathan Cameron 2011-08-30 11:32 ` [PATCH 6/7] staging:iio: remove now defunct header definitions and add some statics Jonathan Cameron 2011-08-30 11:32 ` [PATCH 7/7] staging:iio:Documentation sysfs-bus-iio update for chrdev merge Jonathan Cameron 6 siblings, 0 replies; 9+ messages in thread From: Jonathan Cameron @ 2011-08-30 11:32 UTC (permalink / raw) To: greg; +Cc: linux-iio, Jonathan Cameron Sorry all, this one is very invasive, though the driver changes are just trivial interface fixes. Not all done yet. V2 - bring the sca3000 with us. V3 - fix ade7758 bugs in conversion. V4 - add ad5933 Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> --- drivers/staging/iio/Documentation/generic_buffer.c | 12 +- drivers/staging/iio/Documentation/iio_utils.h | 2 +- drivers/staging/iio/accel/adis16201_core.c | 6 +- drivers/staging/iio/accel/adis16203_core.c | 6 +- drivers/staging/iio/accel/adis16204_core.c | 6 +- drivers/staging/iio/accel/adis16209_core.c | 6 +- drivers/staging/iio/accel/adis16240_core.c | 6 +- drivers/staging/iio/accel/lis3l02dq_core.c | 6 +- drivers/staging/iio/accel/sca3000_core.c | 6 +- drivers/staging/iio/accel/sca3000_ring.c | 23 +-- drivers/staging/iio/adc/ad7192.c | 6 +- drivers/staging/iio/adc/ad7298_core.c | 4 +- drivers/staging/iio/adc/ad7476_core.c | 4 +- drivers/staging/iio/adc/ad7606_core.c | 4 +- drivers/staging/iio/adc/ad7793.c | 6 +- drivers/staging/iio/adc/ad7887_core.c | 4 +- drivers/staging/iio/adc/ad799x_core.c | 4 +- drivers/staging/iio/adc/max1363_core.c | 6 +- drivers/staging/iio/gyro/adis16260_core.c | 6 +- drivers/staging/iio/iio.h | 2 +- drivers/staging/iio/iio_core.h | 32 +++ drivers/staging/iio/impedance-analyzer/ad5933.c | 8 +- drivers/staging/iio/imu/adis16400_core.c | 6 +- drivers/staging/iio/industrialio-core.c | 71 ++++++- drivers/staging/iio/industrialio-ring.c | 239 ++++++-------------- drivers/staging/iio/kfifo_buf.c | 26 +-- drivers/staging/iio/meter/ade7758.h | 5 +- drivers/staging/iio/meter/ade7758_core.c | 6 +- drivers/staging/iio/meter/ade7758_ring.c | 4 +- drivers/staging/iio/ring_generic.h | 24 +-- drivers/staging/iio/ring_sw.c | 25 +-- 31 files changed, 254 insertions(+), 317 deletions(-) diff --git a/drivers/staging/iio/Documentation/generic_buffer.c b/drivers/staging/iio/Documentation/generic_buffer.c index f82894f..d580953 100644 --- a/drivers/staging/iio/Documentation/generic_buffer.c +++ b/drivers/staging/iio/Documentation/generic_buffer.c @@ -173,7 +173,7 @@ int main(int argc, char **argv) return -1; /* Find the device requested */ - dev_num = find_type_by_name(device_name, "device"); + dev_num = find_type_by_name(device_name, "iio:device"); if (dev_num < 0) { printf("Failed to find the %s\n", device_name); ret = -ENODEV; @@ -181,7 +181,7 @@ int main(int argc, char **argv) } printf("iio device number being used is %d\n", dev_num); - asprintf(&dev_dir_name, "%sdevice%d", iio_dir, dev_num); + asprintf(&dev_dir_name, "%siio:device%d", iio_dir, dev_num); if (trigger_name == NULL) { /* * Build the trigger name. If it is device associated it's @@ -212,6 +212,7 @@ int main(int argc, char **argv) ret = build_channel_array(dev_dir_name, &infoarray, &num_channels); if (ret) { printf("Problem reading scan element information\n"); + printf("diag %s\n", dev_dir_name); goto error_free_triggername; } @@ -220,7 +221,8 @@ int main(int argc, char **argv) * As we know that the lis3l02dq has only one buffer this may * be built rather than found. */ - ret = asprintf(&buf_dir_name, "%sdevice%d:buffer0", iio_dir, dev_num); + ret = asprintf(&buf_dir_name, + "%siio:device%d/buffer", iio_dir, dev_num); if (ret < 0) { ret = -ENOMEM; goto error_free_triggername; @@ -251,9 +253,7 @@ int main(int argc, char **argv) goto error_free_buf_dir_name; } - ret = asprintf(&buffer_access, - "/dev/device%d:buffer0", - dev_num); + ret = asprintf(&buffer_access, "/dev/iio:device%d", dev_num); if (ret < 0) { ret = -ENOMEM; goto error_free_data; diff --git a/drivers/staging/iio/Documentation/iio_utils.h b/drivers/staging/iio/Documentation/iio_utils.h index 150f440..75938b2 100644 --- a/drivers/staging/iio/Documentation/iio_utils.h +++ b/drivers/staging/iio/Documentation/iio_utils.h @@ -16,7 +16,7 @@ #define IIO_MAX_NAME_LENGTH 30 -#define FORMAT_SCAN_ELEMENTS_DIR "%s:buffer0/scan_elements" +#define FORMAT_SCAN_ELEMENTS_DIR "%s/scan_elements" #define FORMAT_TYPE_FILE "%s_type" const char *iio_dir = "/sys/bus/iio/devices/"; diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c index 2b8c5e9..d16c459 100644 --- a/drivers/staging/iio/accel/adis16201_core.c +++ b/drivers/staging/iio/accel/adis16201_core.c @@ -497,7 +497,7 @@ static int __devinit adis16201_probe(struct spi_device *spi) goto error_unreg_ring_funcs; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, adis16201_channels, ARRAY_SIZE(adis16201_channels)); if (ret) { @@ -520,7 +520,7 @@ static int __devinit adis16201_probe(struct spi_device *spi) error_remove_trigger: adis16201_remove_trigger(indio_dev); error_uninitialize_ring: - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); error_unreg_ring_funcs: adis16201_unconfigure_ring(indio_dev); error_free_dev: @@ -537,7 +537,7 @@ static int adis16201_remove(struct spi_device *spi) struct iio_dev *indio_dev = spi_get_drvdata(spi); adis16201_remove_trigger(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); iio_device_unregister(indio_dev); adis16201_unconfigure_ring(indio_dev); diff --git a/drivers/staging/iio/accel/adis16203_core.c b/drivers/staging/iio/accel/adis16203_core.c index 1483676..cc3869b 100644 --- a/drivers/staging/iio/accel/adis16203_core.c +++ b/drivers/staging/iio/accel/adis16203_core.c @@ -451,7 +451,7 @@ static int __devinit adis16203_probe(struct spi_device *spi) goto error_unreg_ring_funcs; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, adis16203_channels, ARRAY_SIZE(adis16203_channels)); if (ret) { @@ -474,7 +474,7 @@ static int __devinit adis16203_probe(struct spi_device *spi) error_remove_trigger: adis16203_remove_trigger(indio_dev); error_uninitialize_ring: - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); error_unreg_ring_funcs: adis16203_unconfigure_ring(indio_dev); error_free_dev: @@ -491,7 +491,7 @@ static int adis16203_remove(struct spi_device *spi) struct iio_dev *indio_dev = spi_get_drvdata(spi); adis16203_remove_trigger(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); iio_device_unregister(indio_dev); adis16203_unconfigure_ring(indio_dev); diff --git a/drivers/staging/iio/accel/adis16204_core.c b/drivers/staging/iio/accel/adis16204_core.c index 445a75b..3cc229d 100644 --- a/drivers/staging/iio/accel/adis16204_core.c +++ b/drivers/staging/iio/accel/adis16204_core.c @@ -526,7 +526,7 @@ static int __devinit adis16204_probe(struct spi_device *spi) goto error_unreg_ring_funcs; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, adis16204_channels, ARRAY_SIZE(adis16204_channels)); if (ret) { @@ -549,7 +549,7 @@ static int __devinit adis16204_probe(struct spi_device *spi) error_remove_trigger: adis16204_remove_trigger(indio_dev); error_uninitialize_ring: - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); error_unreg_ring_funcs: adis16204_unconfigure_ring(indio_dev); error_free_dev: @@ -566,7 +566,7 @@ static int adis16204_remove(struct spi_device *spi) struct iio_dev *indio_dev = spi_get_drvdata(spi); adis16204_remove_trigger(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); iio_device_unregister(indio_dev); adis16204_unconfigure_ring(indio_dev); diff --git a/drivers/staging/iio/accel/adis16209_core.c b/drivers/staging/iio/accel/adis16209_core.c index ca671dd..fa4c6c0 100644 --- a/drivers/staging/iio/accel/adis16209_core.c +++ b/drivers/staging/iio/accel/adis16209_core.c @@ -499,7 +499,7 @@ static int __devinit adis16209_probe(struct spi_device *spi) goto error_unreg_ring_funcs; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, adis16209_channels, ARRAY_SIZE(adis16209_channels)); if (ret) { @@ -522,7 +522,7 @@ static int __devinit adis16209_probe(struct spi_device *spi) error_remove_trigger: adis16209_remove_trigger(indio_dev); error_uninitialize_ring: - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); error_unreg_ring_funcs: adis16209_unconfigure_ring(indio_dev); error_free_dev: @@ -541,7 +541,7 @@ static int adis16209_remove(struct spi_device *spi) flush_scheduled_work(); adis16209_remove_trigger(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); iio_device_unregister(indio_dev); adis16209_unconfigure_ring(indio_dev); diff --git a/drivers/staging/iio/accel/adis16240_core.c b/drivers/staging/iio/accel/adis16240_core.c index d485f73..2c6ced0 100644 --- a/drivers/staging/iio/accel/adis16240_core.c +++ b/drivers/staging/iio/accel/adis16240_core.c @@ -552,7 +552,7 @@ static int __devinit adis16240_probe(struct spi_device *spi) goto error_unreg_ring_funcs; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, adis16240_channels, ARRAY_SIZE(adis16240_channels)); if (ret) { @@ -575,7 +575,7 @@ static int __devinit adis16240_probe(struct spi_device *spi) error_remove_trigger: adis16240_remove_trigger(indio_dev); error_uninitialize_ring: - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); error_unreg_ring_funcs: adis16240_unconfigure_ring(indio_dev); error_free_dev: @@ -595,7 +595,7 @@ static int adis16240_remove(struct spi_device *spi) flush_scheduled_work(); adis16240_remove_trigger(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); iio_device_unregister(indio_dev); adis16240_unconfigure_ring(indio_dev); diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c index 33001f8..440b26b 100644 --- a/drivers/staging/iio/accel/lis3l02dq_core.c +++ b/drivers/staging/iio/accel/lis3l02dq_core.c @@ -696,7 +696,7 @@ static int __devinit lis3l02dq_probe(struct spi_device *spi) goto error_unreg_ring_funcs; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, lis3l02dq_channels, ARRAY_SIZE(lis3l02dq_channels)); if (ret) { @@ -732,7 +732,7 @@ error_free_interrupt: if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) free_irq(st->us->irq, indio_dev); error_uninitialize_ring: - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); error_unreg_ring_funcs: lis3l02dq_unconfigure_ring(indio_dev); error_free_dev: @@ -789,7 +789,7 @@ static int lis3l02dq_remove(struct spi_device *spi) free_irq(st->us->irq, indio_dev); lis3l02dq_remove_trigger(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); lis3l02dq_unconfigure_ring(indio_dev); iio_device_unregister(indio_dev); diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c index d7f79b4..1a6780f 100644 --- a/drivers/staging/iio/accel/sca3000_core.c +++ b/drivers/staging/iio/accel/sca3000_core.c @@ -1157,7 +1157,7 @@ static int __devinit sca3000_probe(struct spi_device *spi) if (ret < 0) goto error_free_dev; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, sca3000_channels, ARRAY_SIZE(sca3000_channels)); if (ret < 0) @@ -1182,7 +1182,7 @@ error_free_irq: if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) free_irq(spi->irq, indio_dev); error_unregister_ring: - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); error_unregister_dev: error_free_dev: if (regdone) @@ -1223,7 +1223,7 @@ static int sca3000_remove(struct spi_device *spi) return ret; if (spi->irq && gpio_is_valid(irq_to_gpio(spi->irq)) > 0) free_irq(spi->irq, indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); sca3000_unconfigure_ring(indio_dev); iio_device_unregister(indio_dev); diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c index 0b736db..cc38521e 100644 --- a/drivers/staging/iio/accel/sca3000_ring.c +++ b/drivers/staging/iio/accel/sca3000_ring.c @@ -144,11 +144,6 @@ static int sca3000_ring_get_bytes_per_datum(struct iio_ring_buffer *r) { return 6; } -static void sca3000_ring_release(struct device *dev) -{ - struct iio_ring_buffer *r = to_iio_ring_buffer(dev); - kfree(iio_to_hw_ring_buf(r)); -} static IIO_RING_ENABLE_ATTR; static IIO_RING_BYTES_PER_DATUM_ATTR; @@ -258,16 +253,7 @@ static struct attribute *sca3000_ring_attributes[] = { static struct attribute_group sca3000_ring_attr = { .attrs = sca3000_ring_attributes, -}; - -static const struct attribute_group *sca3000_ring_attr_groups[] = { - &sca3000_ring_attr, - NULL -}; - -static struct device_type sca3000_ring_type = { - .release = sca3000_ring_release, - .groups = sca3000_ring_attr_groups, + .name = "buffer", }; static struct iio_ring_buffer *sca3000_rb_allocate(struct iio_dev *indio_dev) @@ -282,18 +268,15 @@ static struct iio_ring_buffer *sca3000_rb_allocate(struct iio_dev *indio_dev) ring->private = indio_dev; buf = &ring->buf; buf->stufftoread = 0; + buf->attrs = &sca3000_ring_attr; iio_ring_buffer_init(buf, indio_dev); - buf->dev.type = &sca3000_ring_type; - buf->dev.parent = &indio_dev->dev; - dev_set_drvdata(&buf->dev, (void *)buf); return buf; } static inline void sca3000_rb_free(struct iio_ring_buffer *r) { - if (r) - iio_put_ring_buffer(r); + kfree(iio_to_hw_ring_buf(r)); } static const struct iio_ring_access_funcs sca3000_ring_access_funcs = { diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c index adf6d95..6e1656e 100644 --- a/drivers/staging/iio/adc/ad7192.c +++ b/drivers/staging/iio/adc/ad7192.c @@ -1098,7 +1098,7 @@ static int __devinit ad7192_probe(struct spi_device *spi) if (ret) goto error_unreg_ring; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, indio_dev->channels, indio_dev->num_channels); if (ret) @@ -1111,7 +1111,7 @@ static int __devinit ad7192_probe(struct spi_device *spi) return 0; error_uninitialize_ring: - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); error_remove_trigger: ad7192_remove_trigger(indio_dev); error_unreg_ring: @@ -1136,7 +1136,7 @@ static int ad7192_remove(struct spi_device *spi) struct iio_dev *indio_dev = spi_get_drvdata(spi); struct ad7192_state *st = iio_priv(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); ad7192_remove_trigger(indio_dev); ad7192_ring_cleanup(indio_dev); diff --git a/drivers/staging/iio/adc/ad7298_core.c b/drivers/staging/iio/adc/ad7298_core.c index 3e5bead..9c50b02 100644 --- a/drivers/staging/iio/adc/ad7298_core.c +++ b/drivers/staging/iio/adc/ad7298_core.c @@ -223,7 +223,7 @@ static int __devinit ad7298_probe(struct spi_device *spi) goto error_disable_reg; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, &ad7298_channels[1], /* skip temp0 */ ARRAY_SIZE(ad7298_channels) - 1); if (ret) @@ -253,7 +253,7 @@ static int __devexit ad7298_remove(struct spi_device *spi) struct iio_dev *indio_dev = spi_get_drvdata(spi); struct ad7298_state *st = iio_priv(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); ad7298_ring_cleanup(indio_dev); iio_device_unregister(indio_dev); if (!IS_ERR(st->reg)) { diff --git a/drivers/staging/iio/adc/ad7476_core.c b/drivers/staging/iio/adc/ad7476_core.c index bb8be5d..bea9e82 100644 --- a/drivers/staging/iio/adc/ad7476_core.c +++ b/drivers/staging/iio/adc/ad7476_core.c @@ -186,7 +186,7 @@ static int __devinit ad7476_probe(struct spi_device *spi) if (ret) goto error_disable_reg; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, st->chip_info->channel, ARRAY_SIZE(st->chip_info->channel)); if (ret) @@ -215,7 +215,7 @@ static int ad7476_remove(struct spi_device *spi) /* copy needed as st will have been freed */ struct regulator *reg = st->reg; - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); ad7476_ring_cleanup(indio_dev); iio_device_unregister(indio_dev); if (!IS_ERR(reg)) { diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c index ef05581..7aef4d5 100644 --- a/drivers/staging/iio/adc/ad7606_core.c +++ b/drivers/staging/iio/adc/ad7606_core.c @@ -506,7 +506,7 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq, goto error_free_irq; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, indio_dev->channels, indio_dev->num_channels); if (ret) @@ -541,7 +541,7 @@ int ad7606_remove(struct iio_dev *indio_dev) { struct ad7606_state *st = iio_priv(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); ad7606_ring_cleanup(indio_dev); free_irq(st->irq, indio_dev); diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c index 1bcb3eb..ed993e3 100644 --- a/drivers/staging/iio/adc/ad7793.c +++ b/drivers/staging/iio/adc/ad7793.c @@ -895,7 +895,7 @@ static int __devinit ad7793_probe(struct spi_device *spi) if (ret) goto error_unreg_ring; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, indio_dev->channels, indio_dev->num_channels); if (ret) @@ -908,7 +908,7 @@ static int __devinit ad7793_probe(struct spi_device *spi) return 0; error_uninitialize_ring: - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); error_remove_trigger: ad7793_remove_trigger(indio_dev); error_unreg_ring: @@ -933,7 +933,7 @@ static int ad7793_remove(struct spi_device *spi) struct iio_dev *indio_dev = spi_get_drvdata(spi); struct ad7793_state *st = iio_priv(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); ad7793_remove_trigger(indio_dev); ad7793_ring_cleanup(indio_dev); diff --git a/drivers/staging/iio/adc/ad7887_core.c b/drivers/staging/iio/adc/ad7887_core.c index 74e222f..184ead1 100644 --- a/drivers/staging/iio/adc/ad7887_core.c +++ b/drivers/staging/iio/adc/ad7887_core.c @@ -194,7 +194,7 @@ static int __devinit ad7887_probe(struct spi_device *spi) goto error_disable_reg; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, indio_dev->channels, indio_dev->num_channels); if (ret) @@ -222,7 +222,7 @@ static int ad7887_remove(struct spi_device *spi) struct iio_dev *indio_dev = spi_get_drvdata(spi); struct ad7887_state *st = iio_priv(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); ad7887_ring_cleanup(indio_dev); if (!IS_ERR(st->reg)) { regulator_disable(st->reg); diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c index f1b044b..ba6d4ed 100644 --- a/drivers/staging/iio/adc/ad799x_core.c +++ b/drivers/staging/iio/adc/ad799x_core.c @@ -708,7 +708,7 @@ static int __devinit ad799x_probe(struct i2c_client *client, goto error_cleanup_ring; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, indio_dev->channels, indio_dev->num_channels); if (ret) @@ -752,7 +752,7 @@ static __devexit int ad799x_remove(struct i2c_client *client) if (client->irq > 0) free_irq(client->irq, indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); ad799x_ring_cleanup(indio_dev); if (!IS_ERR(st->reg)) { regulator_disable(st->reg); diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c index 0bf7b74..53b7451 100644 --- a/drivers/staging/iio/adc/max1363_core.c +++ b/drivers/staging/iio/adc/max1363_core.c @@ -1315,7 +1315,7 @@ static int __devinit max1363_probe(struct i2c_client *client, if (ret) goto error_cleanup_ring; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, st->chip_info->channels, st->chip_info->num_channels); if (ret) @@ -1336,7 +1336,7 @@ static int __devinit max1363_probe(struct i2c_client *client, return 0; error_uninit_ring: - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); error_cleanup_ring: max1363_ring_cleanup(indio_dev); error_free_available_scan_masks: @@ -1362,7 +1362,7 @@ static int max1363_remove(struct i2c_client *client) if (client->irq) free_irq(st->client->irq, indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); max1363_ring_cleanup(indio_dev); kfree(indio_dev->available_scan_masks); if (!IS_ERR(reg)) { diff --git a/drivers/staging/iio/gyro/adis16260_core.c b/drivers/staging/iio/gyro/adis16260_core.c index fcd7819..5541cdd 100644 --- a/drivers/staging/iio/gyro/adis16260_core.c +++ b/drivers/staging/iio/gyro/adis16260_core.c @@ -629,7 +629,7 @@ static int __devinit adis16260_probe(struct spi_device *spi) if (ret) goto error_unreg_ring_funcs; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, indio_dev->channels, ARRAY_SIZE(adis16260_channels_x)); if (ret) { @@ -652,7 +652,7 @@ static int __devinit adis16260_probe(struct spi_device *spi) error_remove_trigger: adis16260_remove_trigger(indio_dev); error_uninitialize_ring: - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); error_unreg_ring_funcs: adis16260_unconfigure_ring(indio_dev); error_free_dev: @@ -676,7 +676,7 @@ static int adis16260_remove(struct spi_device *spi) flush_scheduled_work(); adis16260_remove_trigger(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); iio_device_unregister(indio_dev); adis16260_unconfigure_ring(indio_dev); diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h index 5b61a7e..239219b 100644 --- a/drivers/staging/iio/iio.h +++ b/drivers/staging/iio/iio.h @@ -245,7 +245,6 @@ struct iio_info { }; -int iio_event_getfd(struct iio_dev *indio_dev); /** * struct iio_dev - industrial I/O device * @id: [INTERN] used to identify device internally @@ -288,6 +287,7 @@ struct iio_dev { struct list_head channel_attr_list; const char *name; const struct iio_info *info; + struct cdev chrdev; }; /** diff --git a/drivers/staging/iio/iio_core.h b/drivers/staging/iio/iio_core.h index 00e894d..a27fa05 100644 --- a/drivers/staging/iio/iio_core.h +++ b/drivers/staging/iio/iio_core.h @@ -10,6 +10,9 @@ * drivers. */ +#ifndef _IIO_CORE_H_ +#define _IIO_CORE_H_ + /** * iio_device_get_chrdev_minor() - get an unused minor number **/ @@ -46,3 +49,32 @@ int __iio_add_chan_devattr(const char *postfix, /* Event interface flags */ #define IIO_BUSY_BIT_POS 1 + +#ifdef CONFIG_IIO_RING_BUFFER +struct poll_table_struct; + +void iio_chrdev_ring_open(struct iio_dev *indio_dev); +void iio_chrdev_ring_release(struct iio_dev *indio_dev); + +unsigned int iio_ring_poll(struct file *filp, + struct poll_table_struct *wait); +ssize_t iio_ring_read_first_n_outer(struct file *filp, char __user *buf, + size_t n, loff_t *f_ps); + + +#define iio_ring_poll_addr (&iio_ring_poll) +#define iio_ring_read_first_n_outer_addr (&iio_ring_read_first_n_outer) + +#else + +static inline void iio_chrdev_ring_open(struct iio_dev *indio_dev) +{} +static inline void iio_chrdev_ring_release(struct iio_dev *indio_dev) +{} + +#define iio_ring_poll_addr NULL +#define iio_ring_read_first_n_outer_addr NULL + +#endif + +#endif diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c index acc0e69..8668291 100644 --- a/drivers/staging/iio/impedance-analyzer/ad5933.c +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c @@ -733,9 +733,7 @@ static int __devinit ad5933_probe(struct i2c_client *client, regdone = 1; /* skip temp0_input, register in0_(real|imag)_raw */ - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, - &ad5933_channels[1], - 2); + ret = iio_ring_buffer_register_ex(indio_dev, 0, &ad5933_channels[1], 2); if (ret) goto error_unreg_ring; @@ -750,7 +748,7 @@ static int __devinit ad5933_probe(struct i2c_client *client, return 0; error_uninitialize_ring: - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); error_unreg_ring: iio_sw_rb_free(indio_dev->ring); error_disable_reg: @@ -773,7 +771,7 @@ static __devexit int ad5933_remove(struct i2c_client *client) struct iio_dev *indio_dev = i2c_get_clientdata(client); struct ad5933_state *st = iio_priv(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); iio_sw_rb_free(indio_dev->ring); if (!IS_ERR(st->reg)) { regulator_disable(st->reg); diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c index 58a29b1..21c1a07 100644 --- a/drivers/staging/iio/imu/adis16400_core.c +++ b/drivers/staging/iio/imu/adis16400_core.c @@ -853,7 +853,7 @@ static int __devinit adis16400_probe(struct spi_device *spi) goto error_unreg_ring_funcs; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, st->variant->channels, st->variant->num_channels); if (ret) { @@ -877,7 +877,7 @@ error_remove_trigger: if (indio_dev->modes & INDIO_RING_TRIGGERED) adis16400_remove_trigger(indio_dev); error_uninitialize_ring: - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); error_unreg_ring_funcs: adis16400_unconfigure_ring(indio_dev); error_free_dev: @@ -900,7 +900,7 @@ static int adis16400_remove(struct spi_device *spi) goto err_ret; adis16400_remove_trigger(indio_dev); - iio_ring_buffer_unregister(indio_dev->ring); + iio_ring_buffer_unregister(indio_dev); adis16400_unconfigure_ring(indio_dev); iio_device_unregister(indio_dev); diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index 2b72398..e55edfa 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c @@ -292,7 +292,7 @@ void iio_device_free_chrdev_minor(int val) iio_free_ida_val(&iio_chrdev_ida, val); } -int iio_event_getfd(struct iio_dev *indio_dev) +static int iio_event_getfd(struct iio_dev *indio_dev) { if (indio_dev->event_interfaces == NULL) return -ENODEV; @@ -1079,6 +1079,8 @@ static void iio_device_unregister_eventset(struct iio_dev *dev_info) static void iio_dev_release(struct device *device) { struct iio_dev *dev_info = container_of(device, struct iio_dev, dev); + cdev_del(&dev_info->chrdev); + iio_device_free_chrdev_minor(MINOR(device->devt)); iio_put(); kfree(dev_info); } @@ -1118,11 +1120,63 @@ EXPORT_SYMBOL(iio_allocate_device); void iio_free_device(struct iio_dev *dev) { - if (dev) - iio_put_device(dev); + if (dev) { + iio_put(); + kfree(dev); + } } EXPORT_SYMBOL(iio_free_device); +/** + * iio_chrdev_open() - chrdev file open for ring buffer access and ioctls + **/ +static int iio_chrdev_open(struct inode *inode, struct file *filp) +{ + struct iio_dev *dev_info = container_of(inode->i_cdev, + struct iio_dev, chrdev); + filp->private_data = dev_info; + iio_chrdev_ring_open(dev_info); + return 0; +} + +/** + * iio_chrdev_release() - chrdev file close ring buffer access and ioctls + **/ +static int iio_chrdev_release(struct inode *inode, struct file *filp) +{ + iio_chrdev_ring_release(container_of(inode->i_cdev, + struct iio_dev, chrdev)); + return 0; +} + +/* Somewhat of a cross file organization violation - ioctls here are actually + * event related */ +static long iio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + struct iio_dev *indio_dev = filp->private_data; + int __user *ip = (int __user *)arg; + int fd; + + if (cmd == IIO_GET_EVENT_FD_IOCTL) { + fd = iio_event_getfd(indio_dev); + if (copy_to_user(ip, &fd, sizeof(fd))) + return -EFAULT; + return 0; + } + return -EINVAL; +} + +static const struct file_operations iio_ring_fileops = { + .read = iio_ring_read_first_n_outer_addr, + .release = iio_chrdev_release, + .open = iio_chrdev_open, + .poll = iio_ring_poll_addr, + .owner = THIS_MODULE, + .llseek = noop_llseek, + .unlocked_ioctl = iio_ioctl, + .compat_ioctl = iio_ioctl, +}; + int iio_device_register(struct iio_dev *dev_info) { int ret; @@ -1133,7 +1187,13 @@ int iio_device_register(struct iio_dev *dev_info) dev_err(&dev_info->dev, "Failed to get id\n"); goto error_ret; } - dev_set_name(&dev_info->dev, "device%d", dev_info->id); + dev_set_name(&dev_info->dev, "iio:device%d", dev_info->id); + ret = iio_device_get_chrdev_minor(); + if (ret < 0) + goto error_free_ida; + + /* configure elements for the chrdev */ + dev_info->dev.devt = MKDEV(MAJOR(iio_devt), ret); ret = device_add(&dev_info->dev); if (ret) @@ -1153,6 +1213,9 @@ int iio_device_register(struct iio_dev *dev_info) if (dev_info->modes & INDIO_RING_TRIGGERED) iio_device_register_trigger_consumer(dev_info); + cdev_init(&dev_info->chrdev, &iio_ring_fileops); + dev_info->chrdev.owner = dev_info->info->driver_module; + ret = cdev_add(&dev_info->chrdev, dev_info->dev.devt, 1); return 0; error_free_sysfs: diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c index cce02244..1607293 100644 --- a/drivers/staging/iio/industrialio-ring.c +++ b/drivers/staging/iio/industrialio-ring.c @@ -24,42 +24,6 @@ #include "iio_core.h" #include "ring_generic.h" -/** - * iio_ring_open() - chrdev file open for ring buffer access - * - * This function relies on all ring buffer implementations having an - * iio_ring_buffer as their first element. - **/ -static int iio_ring_open(struct inode *inode, struct file *filp) -{ - struct iio_ring_buffer *rb - = container_of(inode->i_cdev, - struct iio_ring_buffer, chrdev); - filp->private_data = rb; - if (rb->access->mark_in_use) - rb->access->mark_in_use(rb); - - return 0; -} - -/** - * iio_ring_release() - chrdev file close ring buffer access - * - * This function relies on all ring buffer implementations having an - * iio_ring_buffer as their first element. - **/ -static int iio_ring_release(struct inode *inode, struct file *filp) -{ - struct iio_ring_buffer *rb - = container_of(inode->i_cdev, - struct iio_ring_buffer, chrdev); - - clear_bit(IIO_BUSY_BIT_POS, &rb->flags); - if (rb->access->unmark_in_use) - rb->access->unmark_in_use(rb); - - return 0; -} /** * iio_ring_read_first_n_outer() - chrdev read for ring buffer access @@ -67,10 +31,11 @@ static int iio_ring_release(struct inode *inode, struct file *filp) * This function relies on all ring buffer implementations having an * iio_ring _bufer as their first element. **/ -static ssize_t iio_ring_read_first_n_outer(struct file *filp, char __user *buf, - size_t n, loff_t *f_ps) +ssize_t iio_ring_read_first_n_outer(struct file *filp, char __user *buf, + size_t n, loff_t *f_ps) { - struct iio_ring_buffer *rb = filp->private_data; + struct iio_dev *indio_dev = filp->private_data; + struct iio_ring_buffer *rb = indio_dev->ring; if (!rb->access->read_first_n) return -EINVAL; @@ -80,10 +45,11 @@ static ssize_t iio_ring_read_first_n_outer(struct file *filp, char __user *buf, /** * iio_ring_poll() - poll the ring to find out if it has data */ -static unsigned int iio_ring_poll(struct file *filp, - struct poll_table_struct *wait) +unsigned int iio_ring_poll(struct file *filp, + struct poll_table_struct *wait) { - struct iio_ring_buffer *rb = filp->private_data; + struct iio_dev *indio_dev = filp->private_data; + struct iio_ring_buffer *rb = indio_dev->ring; poll_wait(filp, &rb->pollq, wait); if (rb->stufftoread) @@ -92,89 +58,21 @@ static unsigned int iio_ring_poll(struct file *filp, return 0; } -/* Somewhat of a cross file organization violation - ioctls here are actually - * event related */ -static long iio_ioctl(struct file *f, unsigned int cmd, unsigned long arg) -{ - - struct iio_ring_buffer *rb = f->private_data; - struct iio_dev *indio_dev = rb->indio_dev; - int __user *ip = (int __user *)arg; - - if (cmd == IIO_GET_EVENT_FD_IOCTL) { - int fd; - fd = iio_event_getfd(indio_dev); - if (copy_to_user(ip, &fd, sizeof(fd))) - return -EFAULT; - return 0; - } - return -EINVAL; -} - -static const struct file_operations iio_ring_fileops = { - .read = iio_ring_read_first_n_outer, - .release = iio_ring_release, - .open = iio_ring_open, - .poll = iio_ring_poll, - .owner = THIS_MODULE, - .llseek = noop_llseek, - .unlocked_ioctl = iio_ioctl, - .compat_ioctl = iio_ioctl, -}; - -void iio_ring_access_release(struct device *dev) +void iio_chrdev_ring_open(struct iio_dev *indio_dev) { - struct iio_ring_buffer *buf - = container_of(dev, struct iio_ring_buffer, dev); - cdev_del(&buf->chrdev); - iio_device_free_chrdev_minor(MINOR(dev->devt)); + struct iio_ring_buffer *rb = indio_dev->ring; + if (rb && rb->access->mark_in_use) + rb->access->mark_in_use(rb); } -EXPORT_SYMBOL(iio_ring_access_release); -static inline int -__iio_request_ring_buffer_chrdev(struct iio_ring_buffer *buf, - struct module *owner, - int id) +void iio_chrdev_ring_release(struct iio_dev *indio_dev) { - int ret; - - buf->flags = 0; - buf->dev.bus = &iio_bus_type; - device_initialize(&buf->dev); - - ret = iio_device_get_chrdev_minor(); - if (ret < 0) - goto error_device_put; - - buf->dev.devt = MKDEV(MAJOR(iio_devt), ret); - dev_set_name(&buf->dev, "%s:buffer%d", - dev_name(buf->dev.parent), - id); - ret = device_add(&buf->dev); - if (ret < 0) { - printk(KERN_ERR "failed to add the ring dev\n"); - goto error_device_put; - } - cdev_init(&buf->chrdev, &iio_ring_fileops); - buf->chrdev.owner = owner; - ret = cdev_add(&buf->chrdev, buf->dev.devt, 1); - if (ret) { - printk(KERN_ERR "failed to allocate ring chrdev\n"); - goto error_device_unregister; - } - return 0; + struct iio_ring_buffer *rb = indio_dev->ring; -error_device_unregister: - device_unregister(&buf->dev); -error_device_put: - put_device(&buf->dev); - - return ret; -} + clear_bit(IIO_BUSY_BIT_POS, &rb->flags); + if (rb->access->unmark_in_use) + rb->access->unmark_in_use(rb); -static void __iio_free_ring_buffer_chrdev(struct iio_ring_buffer *buf) -{ - device_unregister(&buf->dev); } void iio_ring_buffer_init(struct iio_ring_buffer *ring, @@ -209,9 +107,10 @@ static ssize_t iio_scan_el_show(struct device *dev, char *buf) { int ret; - struct iio_ring_buffer *ring = dev_get_drvdata(dev); + struct iio_dev *dev_info = dev_get_drvdata(dev); - ret = iio_scan_mask_query(ring, to_iio_dev_attr(attr)->address); + ret = iio_scan_mask_query(dev_info->ring, + to_iio_dev_attr(attr)->address); if (ret < 0) return ret; return sprintf(buf, "%d\n", ret); @@ -233,8 +132,8 @@ static ssize_t iio_scan_el_store(struct device *dev, { int ret = 0; bool state; - struct iio_ring_buffer *ring = dev_get_drvdata(dev); - struct iio_dev *indio_dev = ring->indio_dev; + struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct iio_ring_buffer *ring = indio_dev->ring; struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); state = !(buf[0] == '0'); @@ -267,8 +166,8 @@ static ssize_t iio_scan_el_ts_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct iio_ring_buffer *ring = dev_get_drvdata(dev); - return sprintf(buf, "%d\n", ring->scan_timestamp); + struct iio_dev *dev_info = dev_get_drvdata(dev); + return sprintf(buf, "%d\n", dev_info->ring->scan_timestamp); } static ssize_t iio_scan_el_ts_store(struct device *dev, @@ -277,26 +176,27 @@ static ssize_t iio_scan_el_ts_store(struct device *dev, size_t len) { int ret = 0; - struct iio_ring_buffer *ring = dev_get_drvdata(dev); - struct iio_dev *indio_dev = ring->indio_dev; + struct iio_dev *indio_dev = dev_get_drvdata(dev); bool state; + state = !(buf[0] == '0'); mutex_lock(&indio_dev->mlock); if (indio_dev->currentmode == INDIO_RING_TRIGGERED) { ret = -EBUSY; goto error_ret; } - ring->scan_timestamp = state; + indio_dev->ring->scan_timestamp = state; error_ret: mutex_unlock(&indio_dev->mlock); return ret ? ret : len; } -static int iio_ring_add_channel_sysfs(struct iio_ring_buffer *ring, +static int iio_ring_add_channel_sysfs(struct iio_dev *indio_dev, const struct iio_chan_spec *chan) { int ret; + struct iio_ring_buffer *ring = indio_dev->ring; ret = __iio_add_chan_devattr("index", "scan_elements", chan, @@ -304,7 +204,7 @@ static int iio_ring_add_channel_sysfs(struct iio_ring_buffer *ring, NULL, 0, 0, - &ring->dev, + &indio_dev->dev, &ring->scan_el_dev_attr_list); if (ret) goto error_ret; @@ -315,7 +215,7 @@ static int iio_ring_add_channel_sysfs(struct iio_ring_buffer *ring, NULL, 0, 0, - &ring->dev, + &indio_dev->dev, &ring->scan_el_dev_attr_list); if (ret) goto error_ret; @@ -327,7 +227,7 @@ static int iio_ring_add_channel_sysfs(struct iio_ring_buffer *ring, &iio_scan_el_store, chan->scan_index, 0, - &ring->dev, + &indio_dev->dev, &ring->scan_el_dev_attr_list); else ret = __iio_add_chan_devattr("en", "scan_elements", @@ -336,16 +236,16 @@ static int iio_ring_add_channel_sysfs(struct iio_ring_buffer *ring, &iio_scan_el_ts_store, chan->scan_index, 0, - &ring->dev, + &indio_dev->dev, &ring->scan_el_dev_attr_list); error_ret: return ret; } -static void iio_ring_remove_and_free_scan_dev_attr(struct iio_ring_buffer *ring, +static void iio_ring_remove_and_free_scan_dev_attr(struct iio_dev *indio_dev, struct iio_dev_attr *p) { - sysfs_remove_file_from_group(&ring->dev.kobj, + sysfs_remove_file_from_group(&indio_dev->dev.kobj, &p->dev_attr.attr, "scan_elements"); kfree(p->dev_attr.attr.name); kfree(p); @@ -360,71 +260,79 @@ static struct attribute_group iio_scan_el_dummy_group = { .attrs = iio_scan_el_dummy_attrs }; -static void __iio_ring_attr_cleanup(struct iio_ring_buffer *ring) +static void __iio_ring_attr_cleanup(struct iio_dev *indio_dev) { struct iio_dev_attr *p, *n; + struct iio_ring_buffer *ring = indio_dev->ring; int anydynamic = !list_empty(&ring->scan_el_dev_attr_list); list_for_each_entry_safe(p, n, &ring->scan_el_dev_attr_list, l) - iio_ring_remove_and_free_scan_dev_attr(ring, p); + iio_ring_remove_and_free_scan_dev_attr(indio_dev, p); if (ring->scan_el_attrs) - sysfs_remove_group(&ring->dev.kobj, + sysfs_remove_group(&indio_dev->dev.kobj, ring->scan_el_attrs); else if (anydynamic) - sysfs_remove_group(&ring->dev.kobj, + sysfs_remove_group(&indio_dev->dev.kobj, &iio_scan_el_dummy_group); } -int iio_ring_buffer_register_ex(struct iio_ring_buffer *ring, int id, +int iio_ring_buffer_register_ex(struct iio_dev *indio_dev, int id, const struct iio_chan_spec *channels, int num_channels) { + struct iio_ring_buffer *ring = indio_dev->ring; int ret, i; - ret = __iio_request_ring_buffer_chrdev(ring, ring->owner, id); - if (ret) - goto error_ret; - if (ring->scan_el_attrs) { - ret = sysfs_create_group(&ring->dev.kobj, + ret = sysfs_create_group(&indio_dev->dev.kobj, ring->scan_el_attrs); if (ret) { - dev_err(&ring->dev, + dev_err(&indio_dev->dev, "Failed to add sysfs scan elements\n"); - goto error_free_ring_buffer_chrdev; + goto error_ret; } } else if (channels) { - ret = sysfs_create_group(&ring->dev.kobj, + ret = sysfs_create_group(&indio_dev->dev.kobj, &iio_scan_el_dummy_group); if (ret) - goto error_free_ring_buffer_chrdev; + goto error_ret; + } + if (ring->attrs) { + ret = sysfs_create_group(&indio_dev->dev.kobj, + ring->attrs); + if (ret) + goto error_cleanup_dynamic; } INIT_LIST_HEAD(&ring->scan_el_dev_attr_list); if (channels) { /* new magic */ for (i = 0; i < num_channels; i++) { - ret = iio_ring_add_channel_sysfs(ring, &channels[i]); + ret = iio_ring_add_channel_sysfs(indio_dev, + &channels[i]); if (ret < 0) - goto error_cleanup_dynamic; + goto error_cleanup_group; } } return 0; +error_cleanup_group: + if (ring->attrs) + sysfs_remove_group(&indio_dev->dev.kobj, ring->attrs); error_cleanup_dynamic: - __iio_ring_attr_cleanup(ring); -error_free_ring_buffer_chrdev: - __iio_free_ring_buffer_chrdev(ring); + __iio_ring_attr_cleanup(indio_dev); error_ret: return ret; } EXPORT_SYMBOL(iio_ring_buffer_register_ex); -void iio_ring_buffer_unregister(struct iio_ring_buffer *ring) +void iio_ring_buffer_unregister(struct iio_dev *indio_dev) { - __iio_ring_attr_cleanup(ring); - __iio_free_ring_buffer_chrdev(ring); + if (indio_dev->ring->attrs) + sysfs_remove_group(&indio_dev->dev.kobj, + indio_dev->ring->attrs); + __iio_ring_attr_cleanup(indio_dev); } EXPORT_SYMBOL(iio_ring_buffer_unregister); @@ -432,7 +340,8 @@ ssize_t iio_read_ring_length(struct device *dev, struct device_attribute *attr, char *buf) { - struct iio_ring_buffer *ring = dev_get_drvdata(dev); + struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct iio_ring_buffer *ring = indio_dev->ring; if (ring->access->get_length) return sprintf(buf, "%d\n", @@ -449,7 +358,8 @@ ssize_t iio_write_ring_length(struct device *dev, { int ret; ulong val; - struct iio_ring_buffer *ring = dev_get_drvdata(dev); + struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct iio_ring_buffer *ring = indio_dev->ring; ret = strict_strtoul(buf, 10, &val); if (ret) @@ -473,7 +383,8 @@ ssize_t iio_read_ring_bytes_per_datum(struct device *dev, struct device_attribute *attr, char *buf) { - struct iio_ring_buffer *ring = dev_get_drvdata(dev); + struct iio_dev *indio_dev = dev_get_drvdata(dev); + struct iio_ring_buffer *ring = indio_dev->ring; if (ring->access->get_bytes_per_datum) return sprintf(buf, "%d\n", @@ -491,8 +402,8 @@ ssize_t iio_store_ring_enable(struct device *dev, int ret; bool requested_state, current_state; int previous_mode; - struct iio_ring_buffer *ring = dev_get_drvdata(dev); - struct iio_dev *dev_info = ring->indio_dev; + struct iio_dev *dev_info = dev_get_drvdata(dev); + struct iio_ring_buffer *ring = dev_info->ring; mutex_lock(&dev_info->mlock); previous_mode = dev_info->currentmode; @@ -584,8 +495,8 @@ ssize_t iio_show_ring_enable(struct device *dev, struct device_attribute *attr, char *buf) { - struct iio_ring_buffer *ring = dev_get_drvdata(dev); - return sprintf(buf, "%d\n", !!(ring->indio_dev->currentmode + struct iio_dev *dev_info = dev_get_drvdata(dev); + return sprintf(buf, "%d\n", !!(dev_info->currentmode & INDIO_ALL_RING_MODES)); } EXPORT_SYMBOL(iio_show_ring_enable); diff --git a/drivers/staging/iio/kfifo_buf.c b/drivers/staging/iio/kfifo_buf.c index 3c9516b..39b05855 100644 --- a/drivers/staging/iio/kfifo_buf.c +++ b/drivers/staging/iio/kfifo_buf.c @@ -87,24 +87,7 @@ static struct attribute *iio_kfifo_attributes[] = { static struct attribute_group iio_kfifo_attribute_group = { .attrs = iio_kfifo_attributes, -}; - -static const struct attribute_group *iio_kfifo_attribute_groups[] = { - &iio_kfifo_attribute_group, - NULL -}; - -static void iio_kfifo_release(struct device *dev) -{ - struct iio_ring_buffer *r = to_iio_ring_buffer(dev); - struct iio_kfifo *kf = iio_to_kfifo(r); - kfifo_free(&kf->kf); - kfree(kf); -} - -static struct device_type iio_kfifo_type = { - .release = iio_kfifo_release, - .groups = iio_kfifo_attribute_groups, + .name = "buffer", }; struct iio_ring_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev) @@ -116,10 +99,8 @@ struct iio_ring_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev) return NULL; kf->update_needed = true; iio_ring_buffer_init(&kf->ring, indio_dev); + kf->ring.attrs = &iio_kfifo_attribute_group; __iio_init_kfifo(kf); - kf->ring.dev.type = &iio_kfifo_type; - kf->ring.dev.parent = &indio_dev->dev; - dev_set_drvdata(&kf->ring.dev, (void *)&(kf->ring)); return &kf->ring; } @@ -159,8 +140,7 @@ static int iio_set_length_kfifo(struct iio_ring_buffer *r, int length) void iio_kfifo_free(struct iio_ring_buffer *r) { - if (r) - iio_put_ring_buffer(r); + kfree(iio_to_kfifo(r)); } EXPORT_SYMBOL(iio_kfifo_free); diff --git a/drivers/staging/iio/meter/ade7758.h b/drivers/staging/iio/meter/ade7758.h index fd74e15..4d73e1a 100644 --- a/drivers/staging/iio/meter/ade7758.h +++ b/drivers/staging/iio/meter/ade7758.h @@ -150,8 +150,7 @@ ssize_t ade7758_read_data_from_ring(struct device *dev, int ade7758_configure_ring(struct iio_dev *indio_dev); void ade7758_unconfigure_ring(struct iio_dev *indio_dev); -int ade7758_initialize_ring(struct iio_ring_buffer *ring); -void ade7758_uninitialize_ring(struct iio_ring_buffer *ring); +void ade7758_uninitialize_ring(struct iio_dev *indio_dev); int ade7758_set_irq(struct device *dev, bool enable); int ade7758_spi_write_reg_8(struct device *dev, @@ -180,7 +179,7 @@ static inline int ade7758_initialize_ring(struct iio_ring_buffer *ring) { return 0; } -static inline void ade7758_uninitialize_ring(struct iio_ring_buffer *ring) +static inline void ade7758_uninitialize_ring(struct iio_dev *indio_dev) { } #endif /* CONFIG_IIO_RING_BUFFER */ diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c index ac0e092..92c6dcc 100644 --- a/drivers/staging/iio/meter/ade7758_core.c +++ b/drivers/staging/iio/meter/ade7758_core.c @@ -780,7 +780,7 @@ static int __devinit ade7758_probe(struct spi_device *spi) goto error_unreg_ring_funcs; regdone = 1; - ret = iio_ring_buffer_register_ex(indio_dev->ring, 0, + ret = iio_ring_buffer_register_ex(indio_dev, 0, &ade7758_channels[0], ARRAY_SIZE(ade7758_channels)); if (ret) { @@ -805,7 +805,7 @@ error_remove_trigger: if (indio_dev->modes & INDIO_RING_TRIGGERED) ade7758_remove_trigger(indio_dev); error_uninitialize_ring: - ade7758_uninitialize_ring(indio_dev->ring); + ade7758_uninitialize_ring(indio_dev); error_unreg_ring_funcs: ade7758_unconfigure_ring(indio_dev); error_free_tx: @@ -832,7 +832,7 @@ static int ade7758_remove(struct spi_device *spi) goto err_ret; ade7758_remove_trigger(indio_dev); - ade7758_uninitialize_ring(indio_dev->ring); + ade7758_uninitialize_ring(indio_dev); ade7758_unconfigure_ring(indio_dev); kfree(st->tx); kfree(st->rx); diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c index 1e2a096..5e740e3 100644 --- a/drivers/staging/iio/meter/ade7758_ring.c +++ b/drivers/staging/iio/meter/ade7758_ring.c @@ -200,7 +200,7 @@ error_iio_sw_rb_free: return ret; } -void ade7758_uninitialize_ring(struct iio_ring_buffer *ring) +void ade7758_uninitialize_ring(struct iio_dev *indio_dev) { - iio_ring_buffer_unregister(ring); + iio_ring_buffer_unregister(indio_dev); } diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h index 81bbe39..db8d0d1 100644 --- a/drivers/staging/iio/ring_generic.h +++ b/drivers/staging/iio/ring_generic.h @@ -94,7 +94,6 @@ struct iio_ring_setup_ops { * @flags: [INTERN] file ops related flags including busy flag. **/ struct iio_ring_buffer { - struct device dev; struct iio_dev *indio_dev; struct module *owner; int length; @@ -111,7 +110,7 @@ struct iio_ring_buffer { wait_queue_head_t pollq; bool stufftoread; unsigned long flags; - struct cdev chrdev; + const struct attribute_group *attrs; }; /** @@ -200,24 +199,15 @@ static inline int iio_scan_mask_set(struct iio_ring_buffer *ring, int bit) return 0; }; -/** - * iio_put_ring_buffer() - notify done with buffer - * @ring: the buffer we are done with. - **/ -static inline void iio_put_ring_buffer(struct iio_ring_buffer *ring) -{ - put_device(&ring->dev); -}; - #define to_iio_ring_buffer(d) \ container_of(d, struct iio_ring_buffer, dev) /** * iio_ring_buffer_register_ex() - register the buffer with IIO core - * @ring: the buffer to be registered + * @indio_dev: device with the buffer to be registered * @id: the id of the buffer (typically 0) **/ -int iio_ring_buffer_register_ex(struct iio_ring_buffer *ring, int id, +int iio_ring_buffer_register_ex(struct iio_dev *indio_dev, int id, const struct iio_chan_spec *channels, int num_channels); @@ -225,9 +215,9 @@ void iio_ring_access_release(struct device *dev); /** * iio_ring_buffer_unregister() - unregister the buffer from IIO core - * @ring: the buffer to be unregistered + * @indio_dev: the device with the buffer to be unregistered **/ -void iio_ring_buffer_unregister(struct iio_ring_buffer *ring); +void iio_ring_buffer_unregister(struct iio_dev *indio_dev); /** * iio_read_ring_length() - attr func to get number of datums in the buffer @@ -274,7 +264,7 @@ int iio_sw_ring_preenable(struct iio_dev *indio_dev); #else /* CONFIG_IIO_RING_BUFFER */ -static inline int iio_ring_buffer_register_ex(struct iio_ring_buffer *ring, +static inline int iio_ring_buffer_register_ex(struct iio_dev *indio_dev, int id, struct iio_chan_spec *channels, int num_channels) @@ -282,7 +272,7 @@ static inline int iio_ring_buffer_register_ex(struct iio_ring_buffer *ring, return 0; } -static inline void iio_ring_buffer_unregister(struct iio_ring_buffer *ring) +static inline void iio_ring_buffer_unregister(struct iio_dev *indio_dev) {}; #endif /* CONFIG_IIO_RING_BUFFER */ diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c index feb84e2..1905e03 100644 --- a/drivers/staging/iio/ring_sw.c +++ b/drivers/staging/iio/ring_sw.c @@ -392,13 +392,6 @@ static int iio_mark_update_needed_sw_rb(struct iio_ring_buffer *r) return 0; } -static void iio_sw_rb_release(struct device *dev) -{ - struct iio_ring_buffer *r = to_iio_ring_buffer(dev); - iio_ring_access_release(&r->dev); - kfree(iio_to_sw_ring(r)); -} - static IIO_RING_ENABLE_ATTR; static IIO_RING_BYTES_PER_DATUM_ATTR; static IIO_RING_LENGTH_ATTR; @@ -413,16 +406,7 @@ static struct attribute *iio_ring_attributes[] = { static struct attribute_group iio_ring_attribute_group = { .attrs = iio_ring_attributes, -}; - -static const struct attribute_group *iio_ring_attribute_groups[] = { - &iio_ring_attribute_group, - NULL -}; - -static struct device_type iio_sw_ring_type = { - .release = iio_sw_rb_release, - .groups = iio_ring_attribute_groups, + .name = "buffer", }; struct iio_ring_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev) @@ -437,9 +421,7 @@ struct iio_ring_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev) buf = &ring->buf; iio_ring_buffer_init(buf, indio_dev); __iio_init_sw_ring_buffer(ring); - buf->dev.type = &iio_sw_ring_type; - buf->dev.parent = &indio_dev->dev; - dev_set_drvdata(&buf->dev, (void *)buf); + buf->attrs = &iio_ring_attribute_group; return buf; } @@ -447,8 +429,7 @@ EXPORT_SYMBOL(iio_sw_rb_allocate); void iio_sw_rb_free(struct iio_ring_buffer *r) { - if (r) - iio_put_ring_buffer(r); + kfree(iio_to_sw_ring(r)); } EXPORT_SYMBOL(iio_sw_rb_free); -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 6/7] staging:iio: remove now defunct header definitions and add some statics 2011-08-30 11:32 [PATCH 0/7] staging:iio: character device merge Jonathan Cameron ` (4 preceding siblings ...) 2011-08-30 11:32 ` [PATCH 5/7] staging:iio: push the main buffer chrdev down to the top level Jonathan Cameron @ 2011-08-30 11:32 ` Jonathan Cameron 2011-08-30 11:32 ` [PATCH 7/7] staging:iio:Documentation sysfs-bus-iio update for chrdev merge Jonathan Cameron 6 siblings, 0 replies; 9+ messages in thread From: Jonathan Cameron @ 2011-08-30 11:32 UTC (permalink / raw) To: greg; +Cc: linux-iio, Jonathan Cameron Now we have combined all chrdevs into one, some bits and bobs are only needed in industrialio-core.c and don't need to be in the core header. Also remove some unused defines. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> --- drivers/staging/iio/iio_core.h | 9 --------- drivers/staging/iio/industrialio-core.c | 9 +++------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/staging/iio/iio_core.h b/drivers/staging/iio/iio_core.h index a27fa05..433952b 100644 --- a/drivers/staging/iio/iio_core.h +++ b/drivers/staging/iio/iio_core.h @@ -14,13 +14,6 @@ #define _IIO_CORE_H_ /** - * iio_device_get_chrdev_minor() - get an unused minor number - **/ -int iio_device_get_chrdev_minor(void); -void iio_device_free_chrdev_minor(int val); - - -/** * iio_put() - internal module reference count reduce **/ void iio_put(void); @@ -30,8 +23,6 @@ void iio_put(void); **/ void iio_get(void); -extern dev_t iio_devt; - int __iio_add_chan_devattr(const char *postfix, const char *group, struct iio_chan_spec const *chan, diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index e55edfa..de91878 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c @@ -27,9 +27,6 @@ #include "iio_core_trigger.h" #include "chrdev.h" -#define IIO_ID_PREFIX "device" -#define IIO_ID_FORMAT IIO_ID_PREFIX "%d" - /* IDR to assign each registered device a unique id*/ static DEFINE_IDA(iio_ida); /* IDR to allocate character device minor numbers */ @@ -37,7 +34,7 @@ static DEFINE_IDA(iio_chrdev_ida); /* Lock used to protect both of the above */ static DEFINE_SPINLOCK(iio_ida_lock); -dev_t iio_devt; +static dev_t iio_devt; #define IIO_DEV_MAX 256 struct bus_type iio_bus_type = { @@ -276,7 +273,7 @@ static const struct file_operations iio_event_chrdev_fileops = { .llseek = noop_llseek, }; -int iio_device_get_chrdev_minor(void) +static int iio_device_get_chrdev_minor(void) { int ret; @@ -287,7 +284,7 @@ int iio_device_get_chrdev_minor(void) return -ENOMEM; } -void iio_device_free_chrdev_minor(int val) +static void iio_device_free_chrdev_minor(int val) { iio_free_ida_val(&iio_chrdev_ida, val); } -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 7/7] staging:iio:Documentation sysfs-bus-iio update for chrdev merge. 2011-08-30 11:32 [PATCH 0/7] staging:iio: character device merge Jonathan Cameron ` (5 preceding siblings ...) 2011-08-30 11:32 ` [PATCH 6/7] staging:iio: remove now defunct header definitions and add some statics Jonathan Cameron @ 2011-08-30 11:32 ` Jonathan Cameron 6 siblings, 0 replies; 9+ messages in thread From: Jonathan Cameron @ 2011-08-30 11:32 UTC (permalink / raw) To: greg; +Cc: linux-iio, Jonathan Cameron A few element in here have been wrong for some time so cleaned them up whilst here. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> --- drivers/staging/iio/Documentation/sysfs-bus-iio | 573 +++++++++++------------ 1 files changed, 276 insertions(+), 297 deletions(-) diff --git a/drivers/staging/iio/Documentation/sysfs-bus-iio b/drivers/staging/iio/Documentation/sysfs-bus-iio index c19dbf4..bed3bcb 100644 --- a/drivers/staging/iio/Documentation/sysfs-bus-iio +++ b/drivers/staging/iio/Documentation/sysfs-bus-iio @@ -1,4 +1,4 @@ -What: /sys/bus/iio/devices/deviceX +What: /sys/bus/iio/devices/iio:deviceX KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: @@ -6,7 +6,7 @@ Description: Corresponds to a grouping of sensor channels. X is the IIO index of the device. -What: /sys/bus/iio/devices/device[n]/power_state +What: /sys/bus/iio/devices/iio:deviceX/power_state KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: @@ -25,21 +25,20 @@ Description: generalize well and hence are not documented in this file. X is the IIO index of the trigger. -What: /sys/bus/iio/devices/deviceX:buffer +What: /sys/bus/iio/devices/iio:deviceX/buffer KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: - Link to /sys/class/iio/deviceX/deviceX:buffer. X indicates - the device with which this buffer buffer is associated. + Directory of attributes relating to the buffer for the device. -What: /sys/bus/iio/devices/deviceX/name +What: /sys/bus/iio/devices/iio:deviceX/name KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: Description of the physical chip / device for device X. Typically a part number. -What: /sys/bus/iio/devices/deviceX/sampling_frequency +What: /sys/bus/iio/devices/iio:deviceX/sampling_frequency KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: @@ -52,40 +51,40 @@ Description: relevant directories. If it effects all of the above then it is to be found in the base device directory as here. -What: /sys/bus/iio/devices/deviceX/sampling_frequency_available +What: /sys/bus/iio/devices/iio:deviceX/sampling_frequency_available KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: When the internal sampling clock can only take a small discrete set of values, this file lists those available. -What: /sys/bus/iio/devices/deviceX/range +What: /sys/bus/iio/devices/iio:deviceX/range KernelVersion: 2.6.38 Contact: linux-iio@vger.kernel.org Description: Hardware dependent ADC Full Scale Range in mVolt. -What: /sys/bus/iio/devices/deviceX/range_available +What: /sys/bus/iio/devices/iio:deviceX/range_available KernelVersion: 2.6.38 Contact: linux-iio@vger.kernel.org Description: Hardware dependent supported vales for ADC Full Scale Range. -What: /sys/bus/iio/devices/deviceX/oversampling_ratio +What: /sys/bus/iio/devices/iio:deviceX/oversampling_ratio KernelVersion: 2.6.38 Contact: linux-iio@vger.kernel.org Description: Hardware dependent ADC oversampling. Controls the sampling ratio of the digital filter if available. -What: /sys/bus/iio/devices/deviceX/oversampling_ratio_available +What: /sys/bus/iio/devices/iio:deviceX/oversampling_ratio_available KernelVersion: 2.6.38 Contact: linux-iio@vger.kernel.org Description: Hardware dependent values supported by the oversampling filter. -What: /sys/bus/iio/devices/deviceX/inY_raw -What: /sys/bus/iio/devices/deviceX/inY_supply_raw +What: /sys/bus/iio/devices/iio:deviceX/inY_raw +What: /sys/bus/iio/devices/iio:deviceX/inY_supply_raw KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: @@ -95,7 +94,7 @@ Description: versions may be used. The number must always be specified and unique to allow association with event codes. -What: /sys/bus/iio/devices/deviceX/inY-inZ_raw +What: /sys/bus/iio/devices/iio:deviceX/inY-inZ_raw KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: @@ -105,10 +104,10 @@ Description: separately available. In differential only parts, then all that is required is a consistent labeling. -What: /sys/bus/iio/devices/deviceX/temp_raw -What: /sys/bus/iio/devices/deviceX/temp_x_raw -What: /sys/bus/iio/devices/deviceX/temp_y_raw -What: /sys/bus/iio/devices/deviceX/temp_z_raw +What: /sys/bus/iio/devices/iio:deviceX/temp_raw +What: /sys/bus/iio/devices/iio:deviceX/temp_x_raw +What: /sys/bus/iio/devices/iio:deviceX/temp_y_raw +What: /sys/bus/iio/devices/iio:deviceX/temp_z_raw KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: @@ -117,15 +116,15 @@ Description: sensor is associated with one part of a compound device (e.g. a gyroscope axis). -What: /sys/bus/iio/devices/deviceX/tempX_input +What: /sys/bus/iio/devices/iio:deviceX/tempX_input KernelVersion: 2.6.38 Contact: linux-iio@vger.kernel.org Description: Scaled temperature measurement in milli degrees Celsius. -What: /sys/bus/iio/devices/deviceX/accel_x_raw -What: /sys/bus/iio/devices/deviceX/accel_y_raw -What: /sys/bus/iio/devices/deviceX/accel_z_raw +What: /sys/bus/iio/devices/iio:deviceX/accel_x_raw +What: /sys/bus/iio/devices/iio:deviceX/accel_y_raw +What: /sys/bus/iio/devices/iio:deviceX/accel_z_raw KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: @@ -135,9 +134,9 @@ Description: this orientation). Has all of the equivalent parameters as per inY. Units after application of scale and offset are m/s^2. -What: /sys/bus/iio/devices/deviceX/gyro_x_raw -What: /sys/bus/iio/devices/deviceX/gyro_y_raw -What: /sys/bus/iio/devices/deviceX/gyro_z_raw +What: /sys/bus/iio/devices/iio:deviceX/gyro_x_raw +What: /sys/bus/iio/devices/iio:deviceX/gyro_y_raw +What: /sys/bus/iio/devices/iio:deviceX/gyro_z_raw KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: @@ -146,9 +145,9 @@ Description: radians per second. Has all the equivalent parameters as per inY. -What: /sys/bus/iio/devices/deviceX/incli_x_raw -What: /sys/bus/iio/devices/deviceX/incli_y_raw -What: /sys/bus/iio/devices/deviceX/incli_z_raw +What: /sys/bus/iio/devices/iio:deviceX/incli_x_raw +What: /sys/bus/iio/devices/iio:deviceX/incli_y_raw +What: /sys/bus/iio/devices/iio:deviceX/incli_z_raw KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: @@ -156,9 +155,9 @@ Description: arbitrarily assigned). Data converted by application of offset and scale to Degrees. -What: /sys/bus/iio/devices/deviceX/magn_x_raw -What: /sys/bus/iio/devices/deviceX/magn_y_raw -What: /sys/bus/iio/devices/deviceX/magn_z_raw +What: /sys/bus/iio/devices/iio:deviceX/magn_x_raw +What: /sys/bus/iio/devices/iio:deviceX/magn_y_raw +What: /sys/bus/iio/devices/iio:deviceX/magn_z_raw KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: @@ -168,9 +167,9 @@ Description: offset then scale to Gauss. Has all the equivalent modifiers as per inY. -What: /sys/bus/iio/devices/deviceX/accel_x_peak_raw -What: /sys/bus/iio/devices/deviceX/accel_y_peak_raw -What: /sys/bus/iio/devices/deviceX/accel_z_peak_raw +What: /sys/bus/iio/devices/iio:deviceX/accel_x_peak_raw +What: /sys/bus/iio/devices/iio:deviceX/accel_y_peak_raw +What: /sys/bus/iio/devices/iio:deviceX/accel_z_peak_raw KernelVersion: 2.6.36 Contact: linux-iio@vger.kernel.org Description: @@ -179,15 +178,15 @@ Description: and are otherwise the direct equivalent of the <type>Y[_name]_raw attributes. -What: /sys/bus/iio/devices/deviceX/accel_xyz_squared_peak_raw +What: /sys/bus/iio/devices/iio:deviceX/accel_xyz_squared_peak_raw KernelVersion: 2.6.36 Contact: linux-iio@vger.kernel.org Description: A computed peak value based on the sum squared magnitude of the underlying value in the specified directions. -What: /sys/bus/iio/devices/deviceX/accel_offset -What: /sys/bus/iio/devices/deviceX/temp_offset +What: /sys/bus/iio/devices/iio:deviceX/accel_offset +What: /sys/bus/iio/devices/iio:deviceX/temp_offset KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: @@ -202,17 +201,17 @@ Description: for variation between different instances of the part, typically adjusted by using some hardware supported calibration procedure. -What: /sys/bus/iio/devices/deviceX/inY_scale -What: /sys/bus/iio/devices/deviceX/inY_supply_scale -What: /sys/bus/iio/devices/deviceX/in_scale -What: /sys/bus/iio/devices/deviceX/outY_scale -What: /sys/bus/iio/devices/deviceX/accel_scale -What: /sys/bus/iio/devices/deviceX/accel_peak_scale -What: /sys/bus/iio/devices/deviceX/gyro_scale -What: /sys/bus/iio/devices/deviceX/magn_scale -What: /sys/bus/iio/devices/deviceX/magn_x_scale -What: /sys/bus/iio/devices/deviceX/magn_y_scale -What: /sys/bus/iio/devices/deviceX/magn_z_scale +What: /sys/bus/iio/devices/iio:deviceX/inY_scale +What: /sys/bus/iio/devices/iio:deviceX/inY_supply_scale +What: /sys/bus/iio/devices/iio:deviceX/in_scale +What: /sys/bus/iio/devices/iio:deviceX/outY_scale +What: /sys/bus/iio/devices/iio:deviceX/accel_scale +What: /sys/bus/iio/devices/iio:deviceX/accel_peak_scale +What: /sys/bus/iio/devices/iio:deviceX/gyro_scale +What: /sys/bus/iio/devices/iio:deviceX/magn_scale +What: /sys/bus/iio/devices/iio:deviceX/magn_x_scale +What: /sys/bus/iio/devices/iio:deviceX/magn_y_scale +What: /sys/bus/iio/devices/iio:deviceX/magn_z_scale KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: @@ -224,12 +223,12 @@ Description: <type>[Y][_name]_scale. The peak modifier means this value is applied to <type>Y[_name]_peak_raw values. -What: /sys/bus/iio/devices/deviceX/accel_x_calibbias -What: /sys/bus/iio/devices/deviceX/accel_y_calibbias -What: /sys/bus/iio/devices/deviceX/accel_z_calibbias -What: /sys/bus/iio/devices/deviceX/gyro_x_calibbias -What: /sys/bus/iio/devices/deviceX/gyro_y_calibbias -What: /sys/bus/iio/devices/deviceX/gyro_z_calibbias +What: /sys/bus/iio/devices/iio:deviceX/accel_x_calibbias +What: /sys/bus/iio/devices/iio:deviceX/accel_y_calibbias +What: /sys/bus/iio/devices/iio:deviceX/accel_z_calibbias +What: /sys/bus/iio/devices/iio:deviceX/gyro_x_calibbias +What: /sys/bus/iio/devices/iio:deviceX/gyro_y_calibbias +What: /sys/bus/iio/devices/iio:deviceX/gyro_z_calibbias KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: @@ -237,15 +236,15 @@ Description: inaccuracies). If shared across all channels, <type>_calibbias is used. -What /sys/bus/iio/devices/deviceX/inY_calibscale -What /sys/bus/iio/devices/deviceX/inY_supply_calibscale -What /sys/bus/iio/devices/deviceX/in_calibscale -What /sys/bus/iio/devices/deviceX/accel_x_calibscale -What /sys/bus/iio/devices/deviceX/accel_y_calibscale -What /sys/bus/iio/devices/deviceX/accel_z_calibscale -What /sys/bus/iio/devices/deviceX/gyro_x_calibscale -What /sys/bus/iio/devices/deviceX/gyro_y_calibscale -What /sys/bus/iio/devices/deviceX/gyro_z_calibscale +What /sys/bus/iio/devices/iio:deviceX/inY_calibscale +What /sys/bus/iio/devices/iio:deviceX/inY_supply_calibscale +What /sys/bus/iio/devices/iio:deviceX/in_calibscale +What /sys/bus/iio/devices/iio:deviceX/accel_x_calibscale +What /sys/bus/iio/devices/iio:deviceX/accel_y_calibscale +What /sys/bus/iio/devices/iio:deviceX/accel_z_calibscale +What /sys/bus/iio/devices/iio:deviceX/gyro_x_calibscale +What /sys/bus/iio/devices/iio:deviceX/gyro_y_calibscale +What /sys/bus/iio/devices/iio:deviceX/gyro_z_calibscale KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: @@ -253,14 +252,14 @@ Description: production inaccuracies). If shared across all channels, <type>_calibscale is used. -What: /sys/bus/iio/devices/deviceX/accel_scale_available +What: /sys/bus/iio/devices/iio:deviceX/accel_scale_available KernelVersion: 2.635 Contact: linux-iio@vger.kernel.org Description: If a discrete set of scale values are available, they are listed in this attribute. -What: /sys/bus/iio/devices/deviceX/outY_raw +What: /sys/bus/iio/devices/iio:deviceX/outY_raw KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: @@ -268,7 +267,7 @@ Description: channel Y. The number must always be specified and unique if the output corresponds to a single channel. -What: /sys/bus/iio/devices/deviceX/outY&Z_raw +What: /sys/bus/iio/devices/iio:deviceX/outY&Z_raw KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: @@ -277,8 +276,8 @@ Description: where a single output sets the value for multiple channels simultaneously. -What: /sys/bus/iio/devices/deviceX/outY_powerdown_mode -What: /sys/bus/iio/devices/deviceX/out_powerdown_mode +What: /sys/bus/iio/devices/iio:deviceX/outY_powerdown_mode +What: /sys/bus/iio/devices/iio:deviceX/out_powerdown_mode KernelVersion: 2.6.38 Contact: linux-iio@vger.kernel.org Description: @@ -291,16 +290,16 @@ Description: outX_powerdown_mode_available. If Y is not present the mode is shared across all outputs. -What: /sys/bus/iio/devices/deviceX/outY_powerdown_mode_available -What: /sys/bus/iio/devices/deviceX/out_powerdown_mode_available +What: /sys/bus/iio/devices/iio:deviceX/outY_powerdown_mode_available +What: /sys/bus/iio/devices/iio:deviceX/out_powerdown_mode_available KernelVersion: 2.6.38 Contact: linux-iio@vger.kernel.org Description: Lists all available output power down modes. If Y is not present the mode is shared across all outputs. -What: /sys/bus/iio/devices/deviceX/outY_powerdown -What: /sys/bus/iio/devices/deviceX/out_powerdown +What: /sys/bus/iio/devices/iio:deviceX/outY_powerdown +What: /sys/bus/iio/devices/iio:deviceX/out_powerdown KernelVersion: 2.6.38 Contact: linux-iio@vger.kernel.org Description: @@ -309,45 +308,37 @@ Description: normal operation. Y may be suppressed if all outputs are controlled together. -What: /sys/bus/iio/devices/deviceX/deviceX:eventY +What: /sys/bus/iio/devices/iio:deviceX/events KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: Configuration of which hardware generated events are passed up to user-space. -What: /sys/bus/iio/devices/deviceX:event/dev -What: /sys/bus/iio/devices/deviceX:eventY/dev -KernelVersion: 2.6.35 -Contact: linux-iio@vger.kernel.org -Description: - major:minor character device numbers for the event line Y of - device X. - -What: /sys/.../deviceX:eventY/accel_x_thresh_rising_en -What: /sys/.../deviceX:eventY/accel_x_thresh_falling_en -What: /sys/.../deviceX:eventY/accel_y_thresh_rising_en -What: /sys/.../deviceX:eventY/accel_y_thresh_falling_en -What: /sys/.../deviceX:eventY/accel_z_thresh_rising_en -What: /sys/.../deviceX:eventY/accel_z_thresh_falling_en -What: /sys/.../deviceX:eventY/gyro_x_thresh_rising_en -What: /sys/.../deviceX:eventY/gyro_x_thresh_falling_en -What: /sys/.../deviceX:eventY/gyro_y_thresh_rising_en -What: /sys/.../deviceX:eventY/gyro_y_thresh_falling_en -What: /sys/.../deviceX:eventY/gyro_z_thresh_rising_en -What: /sys/.../deviceX:eventY/gyro_z_thresh_falling_en -What: /sys/.../deviceX:eventY/magn_x_thresh_rising_en -What: /sys/.../deviceX:eventY/magn_x_thresh_falling_en -What: /sys/.../deviceX:eventY/magn_y_thresh_rising_en -What: /sys/.../deviceX:eventY/magn_y_thresh_falling_en -What: /sys/.../deviceX:eventY/magn_z_thresh_rising_en -What: /sys/.../deviceX:eventY/magn_z_thresh_falling_en -What: /sys/.../deviceX:eventY/inZ_supply_thresh_rising_en -What: /sys/.../deviceX:eventY/inZ_supply_thresh_falling_en -What: /sys/.../deviceX:eventY/inZ_thresh_rising_en -What: /sys/.../deviceX:eventY/inZ_thresh_falling_en -What: /sys/.../deviceX:eventY/temp_thresh_rising_en -What: /sys/.../deviceX:eventY/temp_thresh_falling_en +What: /sys/.../iio:deviceX/events/accel_x_thresh_rising_en +What: /sys/.../iio:deviceX/events/accel_x_thresh_falling_en +What: /sys/.../iio:deviceX/events/accel_y_thresh_rising_en +What: /sys/.../iio:deviceX/events/accel_y_thresh_falling_en +What: /sys/.../iio:deviceX/events/accel_z_thresh_rising_en +What: /sys/.../iio:deviceX/events/accel_z_thresh_falling_en +What: /sys/.../iio:deviceX/events/gyro_x_thresh_rising_en +What: /sys/.../iio:deviceX/events/gyro_x_thresh_falling_en +What: /sys/.../iio:deviceX/events/gyro_y_thresh_rising_en +What: /sys/.../iio:deviceX/events/gyro_y_thresh_falling_en +What: /sys/.../iio:deviceX/events/gyro_z_thresh_rising_en +What: /sys/.../iio:deviceX/events/gyro_z_thresh_falling_en +What: /sys/.../iio:deviceX/events/magn_x_thresh_rising_en +What: /sys/.../iio:deviceX/events/magn_x_thresh_falling_en +What: /sys/.../iio:deviceX/events/magn_y_thresh_rising_en +What: /sys/.../iio:deviceX/events/magn_y_thresh_falling_en +What: /sys/.../iio:deviceX/events/magn_z_thresh_rising_en +What: /sys/.../iio:deviceX/events/magn_z_thresh_falling_en +What: /sys/.../iio:deviceX/events/inZ_supply_thresh_rising_en +What: /sys/.../iio:deviceX/events/inZ_supply_thresh_falling_en +What: /sys/.../iio:deviceX/events/inZ_thresh_rising_en +What: /sys/.../iio:deviceX/events/inZ_thresh_falling_en +What: /sys/.../iio:deviceX/events/temp_thresh_rising_en +What: /sys/.../iio:deviceX/events/temp_thresh_falling_en KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: @@ -369,30 +360,30 @@ Description: a given event type is enabled a future point (and not those for whatever event was previously enabled). -What: /sys/.../deviceX:eventY/accel_x_roc_rising_en -What: /sys/.../deviceX:eventY/accel_x_roc_falling_en -What: /sys/.../deviceX:eventY/accel_y_roc_rising_en -What: /sys/.../deviceX:eventY/accel_y_roc_falling_en -What: /sys/.../deviceX:eventY/accel_z_roc_rising_en -What: /sys/.../deviceX:eventY/accel_z_roc_falling_en -What: /sys/.../deviceX:eventY/gyro_x_roc_rising_en -What: /sys/.../deviceX:eventY/gyro_x_roc_falling_en -What: /sys/.../deviceX:eventY/gyro_y_roc_rising_en -What: /sys/.../deviceX:eventY/gyro_y_roc_falling_en -What: /sys/.../deviceX:eventY/gyro_z_roc_rising_en -What: /sys/.../deviceX:eventY/gyro_z_roc_falling_en -What: /sys/.../deviceX:eventY/magn_x_roc_rising_en -What: /sys/.../deviceX:eventY/magn_x_roc_falling_en -What: /sys/.../deviceX:eventY/magn_y_roc_rising_en -What: /sys/.../deviceX:eventY/magn_y_roc_falling_en -What: /sys/.../deviceX:eventY/magn_z_roc_rising_en -What: /sys/.../deviceX:eventY/magn_z_roc_falling_en -What: /sys/.../deviceX:eventY/inZ_supply_roc_rising_en -What: /sys/.../deviceX:eventY/inZ_supply_roc_falling_en -What: /sys/.../deviceX:eventY/inZ_roc_rising_en -What: /sys/.../deviceX:eventY/inZ_roc_falling_en -What: /sys/.../deviceX:eventY/temp_roc_rising_en -What: /sys/.../deviceX:eventY/temp_roc_falling_en +What: /sys/.../iio:deviceX/events/accel_x_roc_rising_en +What: /sys/.../iio:deviceX/events/accel_x_roc_falling_en +What: /sys/.../iio:deviceX/events/accel_y_roc_rising_en +What: /sys/.../iio:deviceX/events/accel_y_roc_falling_en +What: /sys/.../iio:deviceX/events/accel_z_roc_rising_en +What: /sys/.../iio:deviceX/events/accel_z_roc_falling_en +What: /sys/.../iio:deviceX/events/gyro_x_roc_rising_en +What: /sys/.../iio:deviceX/events/gyro_x_roc_falling_en +What: /sys/.../iio:deviceX/events/gyro_y_roc_rising_en +What: /sys/.../iio:deviceX/events/gyro_y_roc_falling_en +What: /sys/.../iio:deviceX/events/gyro_z_roc_rising_en +What: /sys/.../iio:deviceX/events/gyro_z_roc_falling_en +What: /sys/.../iio:deviceX/events/magn_x_roc_rising_en +What: /sys/.../iio:deviceX/events/magn_x_roc_falling_en +What: /sys/.../iio:deviceX/events/magn_y_roc_rising_en +What: /sys/.../iio:deviceX/events/magn_y_roc_falling_en +What: /sys/.../iio:deviceX/events/magn_z_roc_rising_en +What: /sys/.../iio:deviceX/events/magn_z_roc_falling_en +What: /sys/.../iio:deviceX/events/inZ_supply_roc_rising_en +What: /sys/.../iio:deviceX/events/inZ_supply_roc_falling_en +What: /sys/.../iio:deviceX/events/inZ_roc_rising_en +What: /sys/.../iio:deviceX/events/inZ_roc_falling_en +What: /sys/.../iio:deviceX/events/temp_roc_rising_en +What: /sys/.../iio:deviceX/events/temp_roc_falling_en KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: @@ -415,30 +406,30 @@ Description: a given event type is enabled a future point (and not those for whatever event was previously enabled). -What: /sys/.../deviceX:eventY/accel_x_raw_thresh_rising_value -What: /sys/.../deviceX:eventY/accel_x_raw_thresh_falling_value -What: /sys/.../deviceX:eventY/accel_y_raw_thresh_rising_value -What: /sys/.../deviceX:eventY/accel_y_raw_thresh_falling_value -What: /sys/.../deviceX:eventY/accel_z_raw_thresh_rising_value -What: /sys/.../deviceX:eventY/accel_z_raw_thresh_falling_value -What: /sys/.../deviceX:eventY/gyro_x_raw_thresh_rising_value -What: /sys/.../deviceX:eventY/gyro_x_raw_thresh_falling_value -What: /sys/.../deviceX:eventY/gyro_y_raw_thresh_rising_value -What: /sys/.../deviceX:eventY/gyro_y_raw_thresh_falling_value -What: /sys/.../deviceX:eventY/gyro_z_raw_thresh_rising_value -What: /sys/.../deviceX:eventY/gyro_z_raw_thresh_falling_value -What: /sys/.../deviceX:eventY/magn_x_raw_thresh_rising_value -What: /sys/.../deviceX:eventY/magn_x_raw_thresh_falling_value -What: /sys/.../deviceX:eventY/magn_y_raw_thresh_rising_value -What: /sys/.../deviceX:eventY/magn_y_raw_thresh_falling_value -What: /sys/.../deviceX:eventY/magn_z_raw_thresh_rising_value -What: /sys/.../deviceX:eventY/magn_z_raw_thresh_falling_value -What: /sys/.../deviceX:eventY/inZ_supply_raw_thresh_rising_value -What: /sys/.../deviceX:eventY/inZ_supply_raw_thresh_falling_value -What: /sys/.../deviceX:eventY/inZ_raw_thresh_falling_value -What: /sys/.../deviceX:eventY/inZ_raw_thresh_falling_value -What: /sys/.../deviceX:eventY/temp_raw_thresh_falling_value -What: /sys/.../deviceX:eventY/temp_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/accel_x_raw_thresh_rising_value +What: /sys/.../iio:deviceX/events/accel_x_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/accel_y_raw_thresh_rising_value +What: /sys/.../iio:deviceX/events/accel_y_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/accel_z_raw_thresh_rising_value +What: /sys/.../iio:deviceX/events/accel_z_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/gyro_x_raw_thresh_rising_value +What: /sys/.../iio:deviceX/events/gyro_x_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/gyro_y_raw_thresh_rising_value +What: /sys/.../iio:deviceX/events/gyro_y_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/gyro_z_raw_thresh_rising_value +What: /sys/.../iio:deviceX/events/gyro_z_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/magn_x_raw_thresh_rising_value +What: /sys/.../iio:deviceX/events/magn_x_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/magn_y_raw_thresh_rising_value +What: /sys/.../iio:deviceX/events/magn_y_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/magn_z_raw_thresh_rising_value +What: /sys/.../iio:deviceX/events/magn_z_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/inZ_supply_raw_thresh_rising_value +What: /sys/.../iio:deviceX/events/inZ_supply_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/inZ_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/inZ_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/temp_raw_thresh_falling_value +What: /sys/.../iio:deviceX/events/temp_raw_thresh_falling_value KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: @@ -452,30 +443,30 @@ Description: value is in raw device units or in processed units (as _raw and _input do on sysfs direct channel read attributes). -What: /sys/.../deviceX:eventY/accel_x_raw_roc_rising_value -What: /sys/.../deviceX:eventY/accel_x_raw_roc_falling_value -What: /sys/.../deviceX:eventY/accel_y_raw_roc_rising_value -What: /sys/.../deviceX:eventY/accel_y_raw_roc_falling_value -What: /sys/.../deviceX:eventY/accel_z_raw_roc_rising_value -What: /sys/.../deviceX:eventY/accel_z_raw_roc_falling_value -What: /sys/.../deviceX:eventY/gyro_x_raw_roc_rising_value -What: /sys/.../deviceX:eventY/gyro_x_raw_roc_falling_value -What: /sys/.../deviceX:eventY/gyro_y_raw_roc_rising_value -What: /sys/.../deviceX:eventY/gyro_y_raw_roc_falling_value -What: /sys/.../deviceX:eventY/gyro_z_raw_roc_rising_value -What: /sys/.../deviceX:eventY/gyro_z_raw_roc_falling_value -What: /sys/.../deviceX:eventY/magn_x_raw_roc_rising_value -What: /sys/.../deviceX:eventY/magn_x_raw_roc_falling_value -What: /sys/.../deviceX:eventY/magn_y_raw_roc_rising_value -What: /sys/.../deviceX:eventY/magn_y_raw_roc_falling_value -What: /sys/.../deviceX:eventY/magn_z_raw_roc_rising_value -What: /sys/.../deviceX:eventY/magn_z_raw_roc_falling_value -What: /sys/.../deviceX:eventY/inZ_supply_raw_roc_rising_value -What: /sys/.../deviceX:eventY/inZ_supply_raw_roc_falling_value -What: /sys/.../deviceX:eventY/inZ_raw_roc_falling_value -What: /sys/.../deviceX:eventY/inZ_raw_roc_falling_value -What: /sys/.../deviceX:eventY/temp_raw_roc_falling_value -What: /sys/.../deviceX:eventY/temp_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/accel_x_raw_roc_rising_value +What: /sys/.../iio:deviceX/events/accel_x_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/accel_y_raw_roc_rising_value +What: /sys/.../iio:deviceX/events/accel_y_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/accel_z_raw_roc_rising_value +What: /sys/.../iio:deviceX/events/accel_z_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/gyro_x_raw_roc_rising_value +What: /sys/.../iio:deviceX/events/gyro_x_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/gyro_y_raw_roc_rising_value +What: /sys/.../iio:deviceX/events/gyro_y_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/gyro_z_raw_roc_rising_value +What: /sys/.../iio:deviceX/events/gyro_z_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/magn_x_raw_roc_rising_value +What: /sys/.../iio:deviceX/events/magn_x_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/magn_y_raw_roc_rising_value +What: /sys/.../iio:deviceX/events/magn_y_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/magn_z_raw_roc_rising_value +What: /sys/.../iio:deviceX/events/magn_z_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/inZ_supply_raw_roc_rising_value +What: /sys/.../iio:deviceX/events/inZ_supply_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/inZ_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/inZ_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/temp_raw_roc_falling_value +What: /sys/.../iio:deviceX/events/temp_raw_roc_falling_value KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: @@ -489,55 +480,55 @@ Description: value is in raw device units or in processed units (as _raw and _input do on sysfs direct channel read attributes). -What: /sys/.../deviceX:eventY/accel_x_thresh_rising_period -What: /sys/.../deviceX:eventY/accel_x_thresh_falling_period -hat: /sys/.../deviceX:eventY/accel_x_roc_rising_period -What: /sys/.../deviceX:eventY/accel_x_roc_falling_period -What: /sys/.../deviceX:eventY/accel_y_thresh_rising_period -What: /sys/.../deviceX:eventY/accel_y_thresh_falling_period -What: /sys/.../deviceX:eventY/accel_y_roc_rising_period -What: /sys/.../deviceX:eventY/accel_y_roc_falling_period -What: /sys/.../deviceX:eventY/accel_z_thresh_rising_period -What: /sys/.../deviceX:eventY/accel_z_thresh_falling_period -What: /sys/.../deviceX:eventY/accel_z_roc_rising_period -What: /sys/.../deviceX:eventY/accel_z_roc_falling_period -What: /sys/.../deviceX:eventY/gyro_x_thresh_rising_period -What: /sys/.../deviceX:eventY/gyro_x_thresh_falling_period -What: /sys/.../deviceX:eventY/gyro_x_roc_rising_period -What: /sys/.../deviceX:eventY/gyro_x_roc_falling_period -What: /sys/.../deviceX:eventY/gyro_y_thresh_rising_period -What: /sys/.../deviceX:eventY/gyro_y_thresh_falling_period -What: /sys/.../deviceX:eventY/gyro_y_roc_rising_period -What: /sys/.../deviceX:eventY/gyro_y_roc_falling_period -What: /sys/.../deviceX:eventY/gyro_z_thresh_rising_period -What: /sys/.../deviceX:eventY/gyro_z_thresh_falling_period -What: /sys/.../deviceX:eventY/gyro_z_roc_rising_period -What: /sys/.../deviceX:eventY/gyro_z_roc_falling_period -What: /sys/.../deviceX:eventY/magn_x_thresh_rising_period -What: /sys/.../deviceX:eventY/magn_x_thresh_falling_period -What: /sys/.../deviceX:eventY/magn_x_roc_rising_period -What: /sys/.../deviceX:eventY/magn_x_roc_falling_period -What: /sys/.../deviceX:eventY/magn_y_thresh_rising_period -What: /sys/.../deviceX:eventY/magn_y_thresh_falling_period -What: /sys/.../deviceX:eventY/magn_y_roc_rising_period -What: /sys/.../deviceX:eventY/magn_y_roc_falling_period -What: /sys/.../deviceX:eventY/magn_z_thresh_rising_period -What: /sys/.../deviceX:eventY/magn_z_thresh_falling_period -What: /sys/.../deviceX:eventY/magn_z_roc_rising_period -What: /sys/.../deviceX:eventY/magn_z_roc_falling_period -What: /sys/.../deviceX:eventY/inZ_supply_thresh_rising_period -What: /sys/.../deviceX:eventY/inZ_supply_thresh_falling_period -What: /sys/.../deviceX:eventY/inz_supply_roc_rising_period -What: /sys/.../deviceX:eventY/inZ_supply_roc_falling_period -What: /sys/.../deviceX:eventY/inZ_thresh_rising_period -What: /sys/.../deviceX:eventY/inZ_thresh_falling_period -What: /sys/.../deviceX:eventY/inZ_roc_rising_period -What: /sys/.../deviceX:eventY/inZ_roc_falling_period -What: /sys/.../deviceX:eventY/temp_thresh_rising_period -What: /sys/.../deviceX:eventY/temp_thresh_falling_period -What: /sys/.../deviceX:eventY/temp_roc_rising_period -What: /sys/.../deviceX:eventY/temp_roc_falling_period -What: /sys/.../deviceX:eventY/accel_x&y&z_mag_falling_period +What: /sys/.../iio:deviceX/events/accel_x_thresh_rising_period +What: /sys/.../iio:deviceX/events/accel_x_thresh_falling_period +hat: /sys/.../iio:deviceX/events/accel_x_roc_rising_period +What: /sys/.../iio:deviceX/events/accel_x_roc_falling_period +What: /sys/.../iio:deviceX/events/accel_y_thresh_rising_period +What: /sys/.../iio:deviceX/events/accel_y_thresh_falling_period +What: /sys/.../iio:deviceX/events/accel_y_roc_rising_period +What: /sys/.../iio:deviceX/events/accel_y_roc_falling_period +What: /sys/.../iio:deviceX/events/accel_z_thresh_rising_period +What: /sys/.../iio:deviceX/events/accel_z_thresh_falling_period +What: /sys/.../iio:deviceX/events/accel_z_roc_rising_period +What: /sys/.../iio:deviceX/events/accel_z_roc_falling_period +What: /sys/.../iio:deviceX/events/gyro_x_thresh_rising_period +What: /sys/.../iio:deviceX/events/gyro_x_thresh_falling_period +What: /sys/.../iio:deviceX/events/gyro_x_roc_rising_period +What: /sys/.../iio:deviceX/events/gyro_x_roc_falling_period +What: /sys/.../iio:deviceX/events/gyro_y_thresh_rising_period +What: /sys/.../iio:deviceX/events/gyro_y_thresh_falling_period +What: /sys/.../iio:deviceX/events/gyro_y_roc_rising_period +What: /sys/.../iio:deviceX/events/gyro_y_roc_falling_period +What: /sys/.../iio:deviceX/events/gyro_z_thresh_rising_period +What: /sys/.../iio:deviceX/events/gyro_z_thresh_falling_period +What: /sys/.../iio:deviceX/events/gyro_z_roc_rising_period +What: /sys/.../iio:deviceX/events/gyro_z_roc_falling_period +What: /sys/.../iio:deviceX/events/magn_x_thresh_rising_period +What: /sys/.../iio:deviceX/events/magn_x_thresh_falling_period +What: /sys/.../iio:deviceX/events/magn_x_roc_rising_period +What: /sys/.../iio:deviceX/events/magn_x_roc_falling_period +What: /sys/.../iio:deviceX/events/magn_y_thresh_rising_period +What: /sys/.../iio:deviceX/events/magn_y_thresh_falling_period +What: /sys/.../iio:deviceX/events/magn_y_roc_rising_period +What: /sys/.../iio:deviceX/events/magn_y_roc_falling_period +What: /sys/.../iio:deviceX/events/magn_z_thresh_rising_period +What: /sys/.../iio:deviceX/events/magn_z_thresh_falling_period +What: /sys/.../iio:deviceX/events/magn_z_roc_rising_period +What: /sys/.../iio:deviceX/events/magn_z_roc_falling_period +What: /sys/.../iio:deviceX/events/inZ_supply_thresh_rising_period +What: /sys/.../iio:deviceX/events/inZ_supply_thresh_falling_period +What: /sys/.../iio:deviceX/events/inz_supply_roc_rising_period +What: /sys/.../iio:deviceX/events/inZ_supply_roc_falling_period +What: /sys/.../iio:deviceX/events/inZ_thresh_rising_period +What: /sys/.../iio:deviceX/events/inZ_thresh_falling_period +What: /sys/.../iio:deviceX/events/inZ_roc_rising_period +What: /sys/.../iio:deviceX/events/inZ_roc_falling_period +What: /sys/.../iio:deviceX/events/temp_thresh_rising_period +What: /sys/.../iio:deviceX/events/temp_thresh_falling_period +What: /sys/.../iio:deviceX/events/temp_roc_rising_period +What: /sys/.../iio:deviceX/events/temp_roc_falling_period +What: /sys/.../iio:deviceX/events/accel_x&y&z_mag_falling_period KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: @@ -545,20 +536,20 @@ Description: met before an event is generated. If direction is not specified then this period applies to both directions. -What: /sys/.../deviceX:eventY/accel_mag_en -What: /sys/.../deviceX:eventY/accel_mag_rising_en -What: /sys/.../deviceX:eventY/accel_mag_falling_en -What: /sys/.../deviceX:eventY/accel_x_mag_en -What: /sys/.../deviceX:eventY/accel_x_mag_rising_en -What: /sys/.../deviceX:eventY/accel_x_mag_falling_en -What: /sys/.../deviceX:eventY/accel_y_mag_en -What: /sys/.../deviceX:eventY/accel_y_mag_rising_en -What: /sys/.../deviceX:eventY/accel_y_mag_falling_en -What: /sys/.../deviceX:eventY/accel_z_mag_en -What: /sys/.../deviceX:eventY/accel_z_mag_rising_en -What: /sys/.../deviceX:eventY/accel_z_mag_falling_en -What: /sys/.../deviceX:eventY/accel_x&y&z_mag_rising_en -What: /sys/.../deviceX:eventY/accel_x&y&z_mag_falling_en +What: /sys/.../iio:deviceX/events/accel_mag_en +What: /sys/.../iio:deviceX/events/accel_mag_rising_en +What: /sys/.../iio:deviceX/events/accel_mag_falling_en +What: /sys/.../iio:deviceX/events/accel_x_mag_en +What: /sys/.../iio:deviceX/events/accel_x_mag_rising_en +What: /sys/.../iio:deviceX/events/accel_x_mag_falling_en +What: /sys/.../iio:deviceX/events/accel_y_mag_en +What: /sys/.../iio:deviceX/events/accel_y_mag_rising_en +What: /sys/.../iio:deviceX/events/accel_y_mag_falling_en +What: /sys/.../iio:deviceX/events/accel_z_mag_en +What: /sys/.../iio:deviceX/events/accel_z_mag_rising_en +What: /sys/.../iio:deviceX/events/accel_z_mag_falling_en +What: /sys/.../iio:deviceX/events/accel_x&y&z_mag_rising_en +What: /sys/.../iio:deviceX/events/accel_x&y&z_mag_falling_en KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: @@ -577,80 +568,68 @@ Description: number or direction is not specified, applies to all channels of this type. -What: /sys/bus/iio/devices/deviceX:buffer:event/dev -KernelVersion: 2.6.35 -Contact: linux-iio@vger.kernel.org -Description: - Buffer for device X event character device major:minor numbers. - -What: /sys/bus/iio/devices/deviceX:buffer:access/dev -KernelVersion: 2.6.35 -Contact: linux-iio@vger.kernel.org -Description: - Buffer for device X access character device major:minor numbers. - -What: /sys/bus/iio/devices/deviceX:buffer/trigger +What: /sys/bus/iio/devices/iio:deviceX/trigger/current_trigger KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: The name of the trigger source being used, as per string given in /sys/class/iio/triggerY/name. -What: /sys/bus/iio/devices/deviceX:buffer/length +What: /sys/bus/iio/devices/iio:deviceX/buffer/length KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: Number of scans contained by the buffer. -What: /sys/bus/iio/devices/deviceX:buffer/bytes_per_datum +What: /sys/bus/iio/devices/iio:deviceX/buffer/bytes_per_datum KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: Bytes per scan. Due to alignment fun, the scan may be larger than implied directly by the scan_element parameters. -What: /sys/bus/iio/devices/deviceX:buffer/enable +What: /sys/bus/iio/devices/iio:deviceX/buffer/enable KernelVersion: 2.6.35 Contact: linux-iio@vger.kernel.org Description: Actually start the buffer capture up. Will start trigger if first device and appropriate. -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements +What: /sys/bus/iio/devices/iio:deviceX/buffer/scan_elements KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: Directory containing interfaces for elements that will be captured for a single triggered sample set in the buffer. -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_x_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_y_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_z_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_x_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_y_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_z_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_x_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_y_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_z_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/timestamp_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/inY_supply_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/inY_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/inY-inZ_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/incli_x_en -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/incli_y_en +What: /sys/.../iio:deviceX/buffer/scan_elements/accel_x_en +What: /sys/.../iio:deviceX/buffer/scan_elements/accel_y_en +What: /sys/.../iio:deviceX/buffer/scan_elements/accel_z_en +What: /sys/.../iio:deviceX/buffer/scan_elements/gyro_x_en +What: /sys/.../iio:deviceX/buffer/scan_elements/gyro_y_en +What: /sys/.../iio:deviceX/buffer/scan_elements/gyro_z_en +What: /sys/.../iio:deviceX/buffer/scan_elements/magn_x_en +What: /sys/.../iio:deviceX/buffer/scan_elements/magn_y_en +What: /sys/.../iio:deviceX/buffer/scan_elements/magn_z_en +What: /sys/.../iio:deviceX/buffer/scan_elements/timestamp_en +What: /sys/.../iio:deviceX/buffer/scan_elements/inY_supply_en +What: /sys/.../iio:deviceX/buffer/scan_elements/inY_en +What: /sys/.../iio:deviceX/buffer/scan_elements/inY-inZ_en +What: /sys/.../iio:deviceX/buffer/scan_elements/incli_x_en +What: /sys/.../iio:deviceX/buffer/scan_elements/incli_y_en KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: Scan element control for triggered data capture. -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_type -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_type -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_type -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/incli_type -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/inY_type -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/in-in_type -What: /sys/.../deviceX:buffer/scan_elements/inY_supply_type -What: /sys/.../deviceX:buffer/scan_elements/timestamp_type +What: /sys/.../iio:deviceX/buffer/scan_elements/accel_type +What: /sys/.../iio:deviceX/buffer/scan_elements/gyro_type +What: /sys/.../iio:deviceX/buffer/scan_elements/magn_type +What: /sys/.../iio:deviceX/buffer/scan_elements/incli_type +What: /sys/.../iio:deviceX/buffer/scan_elements/inY_type +What: /sys/.../iio:deviceX/buffer/scan_elements/in-in_type +What: /sys/.../iio:deviceX/buffer/scan_elements/inY_supply_type +What: /sys/.../iio:deviceX/buffer/scan_elements/timestamp_type KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: @@ -673,27 +652,27 @@ Description: For other storage combinations this attribute will be extended appropriately. -What: /sys/.../deviceX:buffer/scan_elements/accel_type_available +What: /sys/.../iio:deviceX/buffer/scan_elements/accel_type_available KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: If the type parameter can take one of a small set of values, this attribute lists them. -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/inY_index -What: /sys/.../deviceX:buffer/scan_elements/inY_supply_index -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_x_index -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_y_index -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/accel_z_index -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_x_index -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_y_index -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/gyro_z_index -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_x_index -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_y_index -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/magn_z_index -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/incli_x_index -What: /sys/bus/iio/devices/deviceX:buffer/scan_elements/incli_y_index -What: /sys/.../deviceX:buffer/scan_elements/timestamp_index +What: /sys/.../iio:deviceX/buffer/scan_elements/inY_index +What: /sys/.../iio:deviceX/buffer/scan_elements/inY_supply_index +What: /sys/.../iio:deviceX/buffer/scan_elements/accel_x_index +What: /sys/.../iio:deviceX/buffer/scan_elements/accel_y_index +What: /sys/.../iio:deviceX/buffer/scan_elements/accel_z_index +What: /sys/.../iio:deviceX/buffer/scan_elements/gyro_x_index +What: /sys/.../iio:deviceX/buffer/scan_elements/gyro_y_index +What: /sys/.../iio:deviceX/buffer/scan_elements/gyro_z_index +What: /sys/.../iio:deviceX/buffer/scan_elements/magn_x_index +What: /sys/.../iio:deviceX/buffer/scan_elements/magn_y_index +What: /sys/.../iio:deviceX/buffer/scan_elements/magn_z_index +What: /sys/.../iio:deviceX/buffer/scan_elements/incli_x_index +What: /sys/.../iio:deviceX/buffer/scan_elements/incli_y_index +What: /sys/.../iio:deviceX/buffer/scan_elements/in_timestamp_index KernelVersion: 2.6.37 Contact: linux-iio@vger.kernel.org Description: @@ -705,7 +684,7 @@ Description: and the relevant _type attributes to establish the data storage format. -What: /sys/bus/iio/devices/deviceX/gyro_z_quadrature_correction_raw +What: /sys/.../iio:deviceX/gyro_z_quadrature_correction_raw KernelVersion: 2.6.38 Contact: linux-iio@xxxxxxxxxxxxxxx Description: -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 0/7 V2] blue part 5: IIO: Reduce to 1 the number of chrdevs per device.
@ 2011-07-25 13:18 Jonathan Cameron
2011-07-25 13:18 ` [PATCH 4/7] staging:iio: squash chrdev handler remains into users Jonathan Cameron
0 siblings, 1 reply; 9+ messages in thread
From: Jonathan Cameron @ 2011-07-25 13:18 UTC (permalink / raw)
To: linux-iio; +Cc: arnd, Jonathan Cameron
Hi All,
(for Arnd, the blue it is just the current IIO dev tree and this
is the middle of a fair number of other bits and bobs)
Also, updated the main documentation file. Haven't checked the others
yet to see what else needs to change.
Changes since V1:
Basically fix the dumb issue with 'events' naming for the
sysfs directories and Arnds points about correct use of ioctls.
The ioctl docs patch is here, but probably won't merge just yet as
that file explicitly says it doesn't cover staging. We'll nab the
range with the first round of stuff moving out of staging.
On going discussions about how to handle subdirs in sysfs mean I'll
be holding this one up for now. (Sysfs - export sysfs_create_subdir?
on lkml).
Thanks,
Jonathan
Jonathan Cameron (7):
staging:iio:chrdev.h rationalization.
staging:iio: remove specific chrdev for event reading. Get fd from
ioctl on buffer.
ioctl region for IIO.
staging:iio: squash chrdev handler remains into users.
staging:iio: push the main buffer chrdev down to the top level.
staging:iio: remove now defunct header definitions and add some
statics
staging:iio:Documentation sysfs-bus-iio update for chrdev merge.
Documentation/ioctl/ioctl-number.txt | 1 +
drivers/staging/iio/Documentation/generic_buffer.c | 12 +-
drivers/staging/iio/Documentation/iio_utils.h | 2 +-
drivers/staging/iio/Documentation/sysfs-bus-iio | 573 ++++++++++----------
drivers/staging/iio/accel/adis16201_core.c | 6 +-
drivers/staging/iio/accel/adis16203_core.c | 6 +-
drivers/staging/iio/accel/adis16204_core.c | 6 +-
drivers/staging/iio/accel/adis16209_core.c | 6 +-
drivers/staging/iio/accel/adis16240_core.c | 6 +-
drivers/staging/iio/accel/lis3l02dq_core.c | 6 +-
drivers/staging/iio/accel/sca3000_core.c | 7 +-
drivers/staging/iio/accel/sca3000_ring.c | 23 +-
drivers/staging/iio/adc/ad7150.c | 1 +
drivers/staging/iio/adc/ad7298_core.c | 4 +-
drivers/staging/iio/adc/ad7476_core.c | 4 +-
drivers/staging/iio/adc/ad7606_core.c | 4 +-
drivers/staging/iio/adc/ad7745.c | 1 +
drivers/staging/iio/adc/ad7793.c | 6 +-
drivers/staging/iio/adc/ad7816.c | 1 +
drivers/staging/iio/adc/ad7887_core.c | 4 +-
drivers/staging/iio/adc/ad799x_core.c | 6 +-
drivers/staging/iio/adc/adt7310.c | 2 +
drivers/staging/iio/adc/adt7410.c | 2 +
drivers/staging/iio/adc/adt75.c | 1 +
drivers/staging/iio/adc/max1363_core.c | 10 +-
drivers/staging/iio/addac/adt7316.c | 2 +
drivers/staging/iio/chrdev.h | 52 +--
drivers/staging/iio/dac/ad5504.c | 1 +
drivers/staging/iio/gyro/adis16260_core.c | 6 +-
drivers/staging/iio/iio.h | 3 +-
drivers/staging/iio/iio_core.h | 39 +-
drivers/staging/iio/imu/adis16400_core.c | 6 +-
drivers/staging/iio/industrialio-core.c | 273 +++++-----
drivers/staging/iio/industrialio-ring.c | 220 +++-----
drivers/staging/iio/kfifo_buf.c | 26 +-
drivers/staging/iio/meter/ade7758.h | 5 +-
drivers/staging/iio/meter/ade7758_core.c | 6 +-
drivers/staging/iio/meter/ade7758_ring.c | 4 +-
drivers/staging/iio/ring_generic.h | 28 +-
drivers/staging/iio/ring_sw.c | 25 +-
40 files changed, 627 insertions(+), 769 deletions(-)
--
1.7.3.4
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 4/7] staging:iio: squash chrdev handler remains into users. 2011-07-25 13:18 [PATCH 0/7 V2] blue part 5: IIO: Reduce to 1 the number of chrdevs per device Jonathan Cameron @ 2011-07-25 13:18 ` Jonathan Cameron 0 siblings, 0 replies; 9+ messages in thread From: Jonathan Cameron @ 2011-07-25 13:18 UTC (permalink / raw) To: linux-iio; +Cc: arnd, Jonathan Cameron This no longer has any purpose given all chrdevs are pretty much the same now the event interfaces are done via anon fds Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> --- drivers/staging/iio/chrdev.h | 19 ------------------- drivers/staging/iio/industrialio-core.c | 29 ++++++++++------------------- drivers/staging/iio/industrialio-ring.c | 28 +++++++++++++--------------- drivers/staging/iio/ring_generic.h | 5 +++-- 4 files changed, 26 insertions(+), 55 deletions(-) diff --git a/drivers/staging/iio/chrdev.h b/drivers/staging/iio/chrdev.h index c6bd04c..28cce12 100644 --- a/drivers/staging/iio/chrdev.h +++ b/drivers/staging/iio/chrdev.h @@ -11,25 +11,6 @@ #define _IIO_CHRDEV_H_ /** - * struct iio_handler - Structure used to specify file operations - * for a particular chrdev - * @chrdev: character device structure - * @id: the location in the handler table - used for deallocation. - * @flags: file operations related flags including busy flag. - * @private: handler specific data used by the fileops registered with - * the chrdev. - */ -struct iio_handler { - struct cdev chrdev; - int id; - unsigned long flags; - void *private; -}; - -#define iio_cdev_to_handler(cd) \ - container_of(cd, struct iio_handler, chrdev) - -/** * struct iio_event_data - The actual event being pushed to userspace * @id: event identifier * @timestamp: best estimate of time of event occurrence (often from diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index c6a55f0..d0470ed 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c @@ -129,25 +129,24 @@ struct iio_detected_event_list { struct iio_event_data ev; }; - /** * struct iio_event_interface - chrdev interface for an event line * @dev: device assocated with event interface - * @handler: fileoperations and related control for the chrdev * @wait: wait queue to allow blocking reads of events * @event_list_lock: mutex to protect the list of detected events * @det_events: list of detected events * @max_events: maximum number of events before new ones are dropped * @current_events: number of events in detected list + * @flags: file operations related flags including busy flag. */ struct iio_event_interface { - struct iio_handler handler; wait_queue_head_t wait; struct mutex event_list_lock; struct list_head det_events; int max_events; int current_events; struct list_head dev_attr_list; + unsigned long flags; }; int iio_push_event(struct iio_dev *dev_info, @@ -162,7 +161,7 @@ int iio_push_event(struct iio_dev *dev_info, /* Does anyone care? */ mutex_lock(&ev_int->event_list_lock); - if (test_bit(IIO_BUSY_BIT_POS, &ev_int->handler.flags)) { + if (test_bit(IIO_BUSY_BIT_POS, &ev_int->flags)) { if (ev_int->current_events == ev_int->max_events) { mutex_unlock(&ev_int->event_list_lock); return 0; @@ -188,6 +187,7 @@ error_ret: } EXPORT_SYMBOL(iio_push_event); + /* This turns up an awful lot */ ssize_t iio_read_const_attr(struct device *dev, struct device_attribute *attr, @@ -207,6 +207,7 @@ static ssize_t iio_event_chrdev_read(struct file *filep, struct iio_detected_event_list *el; int ret; size_t len; + mutex_lock(&ev_int->event_list_lock); if (list_empty(&ev_int->det_events)) { if (filep->f_flags & O_NONBLOCK) { @@ -250,8 +251,9 @@ static int iio_event_chrdev_release(struct inode *inode, struct file *filep) { struct iio_event_interface *ev_int = filep->private_data; struct iio_detected_event_list *el, *t; + mutex_lock(&ev_int->event_list_lock); - clear_bit(IIO_BUSY_BIT_POS, &ev_int->handler.flags); + clear_bit(IIO_BUSY_BIT_POS, &ev_int->flags); /* * In order to maintain a clean state for reopening, * clear out any awaiting events. The mask will prevent @@ -297,7 +299,7 @@ int iio_event_getfd(struct iio_dev *indio_dev) mutex_lock(&indio_dev->event_interfaces->event_list_lock); if (test_and_set_bit(IIO_BUSY_BIT_POS, - &indio_dev->event_interfaces->handler.flags)) { + &indio_dev->event_interfaces->flags)) { mutex_unlock(&indio_dev->event_interfaces->event_list_lock); return -EBUSY; } @@ -307,11 +309,7 @@ int iio_event_getfd(struct iio_dev *indio_dev) &indio_dev->event_interfaces[0], O_RDONLY); } -static void iio_setup_ev_int(struct iio_event_interface *ev_int, - const char *dev_name, - int index, - struct module *owner, - struct device *dev) +static void iio_setup_ev_int(struct iio_event_interface *ev_int) { mutex_init(&ev_int->event_list_lock); /* discussion point - make this variable? */ @@ -319,8 +317,6 @@ static void iio_setup_ev_int(struct iio_event_interface *ev_int, ev_int->current_events = 0; INIT_LIST_HEAD(&ev_int->det_events); init_waitqueue_head(&ev_int->wait); - ev_int->handler.private = ev_int; - ev_int->handler.flags = 0; } static int __init iio_init(void) @@ -1003,12 +999,7 @@ static int iio_device_register_eventset(struct iio_dev *dev_info) } for (i = 0; i < dev_info->info->num_interrupt_lines; i++) { - iio_setup_ev_int(&dev_info->event_interfaces[i], - dev_name(&dev_info->dev), - i, - dev_info->info->driver_module, - &dev_info->dev); - + iio_setup_ev_int(&dev_info->event_interfaces[i]); if (dev_info->info->event_attrs != NULL) ret = sysfs_create_group(&dev_info->dev.kobj, &dev_info->info diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c index e4554be..cce02244 100644 --- a/drivers/staging/iio/industrialio-ring.c +++ b/drivers/staging/iio/industrialio-ring.c @@ -32,11 +32,10 @@ **/ static int iio_ring_open(struct inode *inode, struct file *filp) { - struct iio_handler *hand - = container_of(inode->i_cdev, struct iio_handler, chrdev); - struct iio_ring_buffer *rb = hand->private; - - filp->private_data = hand->private; + struct iio_ring_buffer *rb + = container_of(inode->i_cdev, + struct iio_ring_buffer, chrdev); + filp->private_data = rb; if (rb->access->mark_in_use) rb->access->mark_in_use(rb); @@ -51,11 +50,11 @@ static int iio_ring_open(struct inode *inode, struct file *filp) **/ static int iio_ring_release(struct inode *inode, struct file *filp) { - struct cdev *cd = inode->i_cdev; - struct iio_handler *hand = iio_cdev_to_handler(cd); - struct iio_ring_buffer *rb = hand->private; + struct iio_ring_buffer *rb + = container_of(inode->i_cdev, + struct iio_ring_buffer, chrdev); - clear_bit(IIO_BUSY_BIT_POS, &rb->access_handler.flags); + clear_bit(IIO_BUSY_BIT_POS, &rb->flags); if (rb->access->unmark_in_use) rb->access->unmark_in_use(rb); @@ -127,7 +126,7 @@ void iio_ring_access_release(struct device *dev) { struct iio_ring_buffer *buf = container_of(dev, struct iio_ring_buffer, dev); - cdev_del(&buf->access_handler.chrdev); + cdev_del(&buf->chrdev); iio_device_free_chrdev_minor(MINOR(dev->devt)); } EXPORT_SYMBOL(iio_ring_access_release); @@ -139,7 +138,7 @@ __iio_request_ring_buffer_chrdev(struct iio_ring_buffer *buf, { int ret; - buf->access_handler.flags = 0; + buf->flags = 0; buf->dev.bus = &iio_bus_type; device_initialize(&buf->dev); @@ -156,9 +155,9 @@ __iio_request_ring_buffer_chrdev(struct iio_ring_buffer *buf, printk(KERN_ERR "failed to add the ring dev\n"); goto error_device_put; } - cdev_init(&buf->access_handler.chrdev, &iio_ring_fileops); - buf->access_handler.chrdev.owner = owner; - ret = cdev_add(&buf->access_handler.chrdev, buf->dev.devt, 1); + cdev_init(&buf->chrdev, &iio_ring_fileops); + buf->chrdev.owner = owner; + ret = cdev_add(&buf->chrdev, buf->dev.devt, 1); if (ret) { printk(KERN_ERR "failed to allocate ring chrdev\n"); goto error_device_unregister; @@ -182,7 +181,6 @@ void iio_ring_buffer_init(struct iio_ring_buffer *ring, struct iio_dev *dev_info) { ring->indio_dev = dev_info; - ring->access_handler.private = ring; init_waitqueue_head(&ring->pollq); } EXPORT_SYMBOL(iio_ring_buffer_init); diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h index d103262..81bbe39 100644 --- a/drivers/staging/iio/ring_generic.h +++ b/drivers/staging/iio/ring_generic.h @@ -85,13 +85,13 @@ struct iio_ring_setup_ops { * @scan_count: [INTERN] the number of elements in the current scan mode * @scan_mask: [INTERN] bitmask used in masking scan mode elements * @scan_timestamp: [INTERN] does the scan mode include a timestamp - * @access_handler: [INTERN] chrdev access handling * @access: [DRIVER] ring access functions associated with the * implementation. * @preenable: [DRIVER] function to run prior to marking ring enabled * @postenable: [DRIVER] function to run after marking ring enabled * @predisable: [DRIVER] function to run prior to marking ring disabled * @postdisable: [DRIVER] function to run after marking ring disabled + * @flags: [INTERN] file ops related flags including busy flag. **/ struct iio_ring_buffer { struct device dev; @@ -104,13 +104,14 @@ struct iio_ring_buffer { int scan_count; unsigned long scan_mask; bool scan_timestamp; - struct iio_handler access_handler; const struct iio_ring_access_funcs *access; const struct iio_ring_setup_ops *setup_ops; struct list_head scan_el_dev_attr_list; wait_queue_head_t pollq; bool stufftoread; + unsigned long flags; + struct cdev chrdev; }; /** -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-08-30 11:32 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-08-30 11:32 [PATCH 0/7] staging:iio: character device merge Jonathan Cameron 2011-08-30 11:32 ` [PATCH 1/7] staging:iio:kfifo buffer - push structure definition down into implementation Jonathan Cameron 2011-08-30 11:32 ` [PATCH 2/7] staging:iio:chrdev.h rationalization Jonathan Cameron 2011-08-30 11:32 ` [PATCH 3/7] staging:iio: remove specific chrdev for event reading. Get fd from ioctl on buffer Jonathan Cameron 2011-08-30 11:32 ` [PATCH 4/7] staging:iio: squash chrdev handler remains into users Jonathan Cameron 2011-08-30 11:32 ` [PATCH 5/7] staging:iio: push the main buffer chrdev down to the top level Jonathan Cameron 2011-08-30 11:32 ` [PATCH 6/7] staging:iio: remove now defunct header definitions and add some statics Jonathan Cameron 2011-08-30 11:32 ` [PATCH 7/7] staging:iio:Documentation sysfs-bus-iio update for chrdev merge Jonathan Cameron -- strict thread matches above, loose matches on Subject: below -- 2011-07-25 13:18 [PATCH 0/7 V2] blue part 5: IIO: Reduce to 1 the number of chrdevs per device Jonathan Cameron 2011-07-25 13:18 ` [PATCH 4/7] staging:iio: squash chrdev handler remains into users Jonathan Cameron
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.