Merge tag 'togreg_8_7_2012' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next

Mixed back of updates and trivial examples fixes.
Nothing terribly interesting in this one.

8 July 2012

3 files changed, 30 insertions, 12 deletions

diff --git a/drivers/staging/iio/Documentation/iio_event_monitor.c b/drivers/staging/iio/Documentation/iio_event_monitor.c
index 4326e9e764c..3a9b0008740 100644
--- a/drivers/staging/iio/Documentation/iio_event_monitor.c
+++ b/drivers/staging/iio/Documentation/iio_event_monitor.c
@@ -68,6 +68,12 @@ static const char * const iio_modifier_names[] = {
         [IIO_MOD_Z] = "z",
         [IIO_MOD_LIGHT_BOTH] = "both",
         [IIO_MOD_LIGHT_IR] = "ir",
+        [IIO_MOD_ROOT_SUM_SQUARED_X_Y] = "sqrt(x^2+y^2)",
+        [IIO_MOD_SUM_SQUARED_X_Y_Z] = "x^2+y^2+z^2",
+        [IIO_MOD_LIGHT_CLEAR] = "clear",
+        [IIO_MOD_LIGHT_RED] = "red",
+        [IIO_MOD_LIGHT_GREEN] = "green",
+        [IIO_MOD_LIGHT_BLUE] = "blue",
 };
 
 static bool event_is_known(struct iio_event_data *event)
@@ -106,6 +112,12 @@ static bool event_is_known(struct iio_event_data *event)
         case IIO_MOD_Z:
         case IIO_MOD_LIGHT_BOTH:
         case IIO_MOD_LIGHT_IR:
+        case IIO_MOD_ROOT_SUM_SQUARED_X_Y:
+        case IIO_MOD_SUM_SQUARED_X_Y_Z:
+        case IIO_MOD_LIGHT_CLEAR:
+        case IIO_MOD_LIGHT_RED:
+        case IIO_MOD_LIGHT_GREEN:
+        case IIO_MOD_LIGHT_BLUE:
                 break;
         default:
                 return false;
diff --git a/drivers/staging/iio/Documentation/iio_utils.h b/drivers/staging/iio/Documentation/iio_utils.h
index 5244fa0dfd2..cf32ae099cd 100644
--- a/drivers/staging/iio/Documentation/iio_utils.h
+++ b/drivers/staging/iio/Documentation/iio_utils.h
@@ -453,7 +453,7 @@ inline int find_type_by_name(const char *name, const char *type)
 
         dp = opendir(iio_dir);
         if (dp == NULL) {
-                printf("No industrialio devices available");
+                printf("No industrialio devices available\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/staging/iio/adc/adt7410.c b/drivers/staging/iio/adc/adt7410.c
index f87992cd1ac..4157596ea3b 100644
--- a/drivers/staging/iio/adc/adt7410.c
+++ b/drivers/staging/iio/adc/adt7410.c
@@ -711,6 +711,7 @@ static int __devinit adt7410_probe(struct i2c_client *client,
         struct iio_dev *indio_dev;
         int ret = 0;
         unsigned long *adt7410_platform_data = client->dev.platform_data;
+        unsigned long local_pdata[] = {0, 0};
 
         indio_dev = iio_device_alloc(sizeof(*chip));
         if (indio_dev == NULL) {
@@ -728,6 +729,9 @@ static int __devinit adt7410_probe(struct i2c_client *client,
         indio_dev->info = &adt7410_info;
         indio_dev->modes = INDIO_DIRECT_MODE;
 
+        if (!adt7410_platform_data)
+                adt7410_platform_data = local_pdata;
+
         /* CT critcal temperature event. line 0 */
         if (client->irq) {
                 ret = request_threaded_irq(client->irq,
@@ -753,13 +757,15 @@ static int __devinit adt7410_probe(struct i2c_client *client,
                         goto error_unreg_ct_irq;
         }
 
-        if (client->irq && adt7410_platform_data[0]) {
+        ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
+        if (ret) {
+                ret = -EIO;
+                goto error_unreg_int_irq;
+        }
 
-                ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config);
-                if (ret) {
-                        ret = -EIO;
-                        goto error_unreg_int_irq;
-                }
+        chip->config |= ADT7410_RESOLUTION;
+
+        if (client->irq && adt7410_platform_data[0]) {
 
                 /* set irq polarity low level */
                 chip->config &= ~ADT7410_CT_POLARITY;
@@ -768,12 +774,12 @@ static int __devinit adt7410_probe(struct i2c_client *client,
                         chip->config |= ADT7410_INT_POLARITY;
                 else
                         chip->config &= ~ADT7410_INT_POLARITY;
+        }
 
-                ret = adt7410_i2c_write_byte(chip, ADT7410_CONFIG, chip->config);
-                if (ret) {
-                        ret = -EIO;
-                        goto error_unreg_int_irq;
-                }
+        ret = adt7410_i2c_write_byte(chip, ADT7410_CONFIG, chip->config);
+        if (ret) {
+                ret = -EIO;
+                goto error_unreg_int_irq;
         }
         ret = iio_device_register(indio_dev);
         if (ret)