9 files changed, 22 insertions, 18 deletions

diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 4427e8e46a7f..0ad208a69c29 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -183,6 +183,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
 
 static const struct iio_info tiadc_info = {
         .read_raw = &tiadc_read_raw,
+        .driver_module = THIS_MODULE,
 };
 
 static int tiadc_probe(struct platform_device *pdev)
diff --git a/drivers/iio/dac/ad7303.c b/drivers/iio/dac/ad7303.c
index 85aeef60dc5f..d546f50f9258 100644
--- a/drivers/iio/dac/ad7303.c
+++ b/drivers/iio/dac/ad7303.c
@@ -235,8 +235,10 @@ static int ad7303_probe(struct spi_device *spi)
 
         if (ext_ref) {
                 st->vref_reg = regulator_get(&spi->dev, "REF");
-                if (IS_ERR(st->vref_reg))
+                if (IS_ERR(st->vref_reg)) {
+                        ret = PTR_ERR(st->vref_reg);
                         goto err_disable_vdd_reg;
+                }
 
                 ret = regulator_enable(st->vref_reg);
                 if (ret)
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 4d6c7d84e155..ea8a4146620d 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -104,7 +104,7 @@ void iio_trigger_unregister(struct iio_trigger *trig_info)
 
         ida_simple_remove(&iio_trigger_ida, trig_info->id);
         /* Possible issue in here */
-        device_unregister(&trig_info->dev);
+        device_del(&trig_info->dev);
 }
 EXPORT_SYMBOL(iio_trigger_unregister);
 
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index 98ddc323add0..0cf5f8e06cfc 100644
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -451,7 +451,7 @@ static int iio_convert_raw_to_processed_unlocked(struct iio_channel *chan,
         int ret;
 
         ret = iio_channel_read(chan, &offset, NULL, IIO_CHAN_INFO_OFFSET);
-        if (ret == 0)
+        if (ret >= 0)
                 raw64 += offset;
 
         scale_type = iio_channel_read(chan, &scale_val, &scale_val2,
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 9c343b40665e..3ffbc56917b4 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -28,7 +28,9 @@
 #include <linux/iio/common/st_sensors.h>
 #include "st_pressure.h"
 
-#define ST_PRESS_MBAR_TO_KPASCAL(x)             (x * 10)
+#define ST_PRESS_LSB_PER_MBAR                   4096UL
+#define ST_PRESS_KPASCAL_NANO_SCALE             (100000000UL / \
+                                                 ST_PRESS_LSB_PER_MBAR)
 #define ST_PRESS_NUMBER_DATA_CHANNELS           1
 
 /* DEFAULT VALUE FOR SENSORS */
@@ -51,8 +53,8 @@
 #define ST_PRESS_1_FS_ADDR                      0x23
 #define ST_PRESS_1_FS_MASK                      0x30
 #define ST_PRESS_1_FS_AVL_1260_VAL              0x00
-#define ST_PRESS_1_FS_AVL_1260_GAIN             ST_PRESS_MBAR_TO_KPASCAL(244141)
 #define ST_PRESS_1_FS_AVL_TEMP_GAIN             2083000
+#define ST_PRESS_1_FS_AVL_1260_GAIN             ST_PRESS_KPASCAL_NANO_SCALE
 #define ST_PRESS_1_BDU_ADDR                     0x20
 #define ST_PRESS_1_BDU_MASK                     0x04
 #define ST_PRESS_1_DRDY_IRQ_ADDR                0x22
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index 1bfe5d81792b..8ed75a94f465 100644
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -257,6 +257,8 @@ static int lis3l02dq_read_raw(struct iio_dev *indio_dev,
                         ret = lis3l02dq_read_reg_s16(indio_dev, reg, val);
                 }
                 mutex_unlock(&indio_dev->mlock);
+                if (ret < 0)
+                        goto error_ret;
                 return IIO_VAL_INT;
         case IIO_CHAN_INFO_SCALE:
                 *val = 0;
diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
index 3fc79e582750..a2e61c2fc8d1 100644
--- a/drivers/staging/iio/adc/ad7291.c
+++ b/drivers/staging/iio/adc/ad7291.c
@@ -517,6 +517,7 @@ static const struct iio_info ad7291_info = {
         .read_event_value = &ad7291_read_event_value,
         .write_event_value = &ad7291_write_event_value,
         .event_attrs = &ad7291_event_attribute_group,
+        .driver_module = THIS_MODULE,
 };
 
 static int ad7291_probe(struct i2c_client *client,
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index d92c97a59d61..9f52a2857929 100644
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -234,7 +234,6 @@ static int mxs_lradc_read_raw(struct iio_dev *iio_dev,
 {
         struct mxs_lradc *lradc = iio_priv(iio_dev);
         int ret;
-        unsigned long mask;
 
         if (m != IIO_CHAN_INFO_RAW)
                 return -EINVAL;
@@ -243,12 +242,6 @@ static int mxs_lradc_read_raw(struct iio_dev *iio_dev,
         if (chan->channel > LRADC_MAX_TOTAL_CHANS)
                 return -EINVAL;
 
-        /* Validate the channel if it doesn't intersect with reserved chans. */
-        bitmap_set(&mask, chan->channel, 1);
-        ret = iio_validate_scan_mask_onehot(iio_dev, &mask);
-        if (ret)
-                return -EINVAL;
-
         /*
          * See if there is no buffered operation in progess. If there is, simply
          * bail out. This can be improved to support both buffered and raw IO at
@@ -661,12 +654,13 @@ static int mxs_lradc_trigger_init(struct iio_dev *iio)
 {
         int ret;
         struct iio_trigger *trig;
+        struct mxs_lradc *lradc = iio_priv(iio);
 
         trig = iio_trigger_alloc("%s-dev%i", iio->name, iio->id);
         if (trig == NULL)
                 return -ENOMEM;
 
-        trig->dev.parent = iio->dev.parent;
+        trig->dev.parent = lradc->dev;
         iio_trigger_set_drvdata(trig, iio);
         trig->ops = &mxs_lradc_trigger_ops;
 
@@ -676,15 +670,17 @@ static int mxs_lradc_trigger_init(struct iio_dev *iio)
                 return ret;
         }
 
-        iio->trig = trig;
+        lradc->trig = trig;
 
         return 0;
 }
 
 static void mxs_lradc_trigger_remove(struct iio_dev *iio)
 {
-        iio_trigger_unregister(iio->trig);
-        iio_trigger_free(iio->trig);
+        struct mxs_lradc *lradc = iio_priv(iio);
+
+        iio_trigger_unregister(lradc->trig);
+        iio_trigger_free(lradc->trig);
 }
 
 static int mxs_lradc_buffer_preenable(struct iio_dev *iio)
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 8d171f427632..3d35b7023591 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -211,8 +211,8 @@ struct iio_chan_spec {
 static inline bool iio_channel_has_info(const struct iio_chan_spec *chan,
         enum iio_chan_info_enum type)
 {
-        return (chan->info_mask_separate & type) |
-               (chan->info_mask_shared_by_type & type);
+        return (chan->info_mask_separate & BIT(type)) |
+               (chan->info_mask_shared_by_type & BIT(type));
 }
 
 #define IIO_ST(si, rb, sb, sh)                                          \