---

yaml
---
r: 268143
b: refs/heads/master
c: 8e7d967
h: refs/heads/master
i:
  268141: b9b1230
  268139: 94990ce
  268135: 1b9b9bf
  268127: ea631b8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ae8cf6275589a9ebb733eb5bdd093859ba1be36
+refs/heads/master: 8e7d967244a8eebcdadb048efc5e66849ec0a6b6

trunk/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",
 };
 
 /**

trunk/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 = {

trunk/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 = {

trunk/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 = {

trunk/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 = {

trunk/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",
 	}
 };
 

trunk/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",
 	}
 };
 

trunk/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 = {

trunk/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;

trunk/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

trunk/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

trunk/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)

trunk/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