Merge 3.16-rc5 into staging-next

We want the fixes in -rc5 in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

8 files changed, 23 insertions, 32 deletions

diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
index 69abf9163df7..54e464e4bb72 100644
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -110,7 +110,6 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev,
         struct accel_3d_state *accel_state = iio_priv(indio_dev);
         int report_id = -1;
         u32 address;
-        int ret;
         int ret_type;
         s32 poll_value;
 
@@ -151,14 +150,12 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev,
                 ret_type = IIO_VAL_INT;
                 break;
         case IIO_CHAN_INFO_SAMP_FREQ:
-                ret = hid_sensor_read_samp_freq_value(
+                ret_type = hid_sensor_read_samp_freq_value(
                         &accel_state->common_attributes, val, val2);
-                ret_type = IIO_VAL_INT_PLUS_MICRO;
                 break;
         case IIO_CHAN_INFO_HYSTERESIS:
-                ret = hid_sensor_read_raw_hyst_value(
+                ret_type = hid_sensor_read_raw_hyst_value(
                         &accel_state->common_attributes, val, val2);
-                ret_type = IIO_VAL_INT_PLUS_MICRO;
                 break;
         default:
                 ret_type = -EINVAL;
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index a4db3026bec6..d5dc4c6ce86c 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -374,7 +374,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
                         return -EAGAIN;
                 }
         }
-        map_val = chan->channel + TOTAL_CHANNELS;
+        map_val = adc_dev->channel_step[chan->scan_index];
 
         /*
          * We check the complete FIFO. We programmed just one entry but in case
diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c
index 40f4e4935d0d..fa034a3dad78 100644
--- a/drivers/iio/gyro/hid-sensor-gyro-3d.c
+++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c
@@ -110,7 +110,6 @@ static int gyro_3d_read_raw(struct iio_dev *indio_dev,
         struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
         int report_id = -1;
         u32 address;
-        int ret;
         int ret_type;
         s32 poll_value;
 
@@ -151,14 +150,12 @@ static int gyro_3d_read_raw(struct iio_dev *indio_dev,
                 ret_type = IIO_VAL_INT;
                 break;
         case IIO_CHAN_INFO_SAMP_FREQ:
-                ret = hid_sensor_read_samp_freq_value(
+                ret_type = hid_sensor_read_samp_freq_value(
                         &gyro_state->common_attributes, val, val2);
-                        ret_type = IIO_VAL_INT_PLUS_MICRO;
                 break;
         case IIO_CHAN_INFO_HYSTERESIS:
-                ret = hid_sensor_read_raw_hyst_value(
+                ret_type = hid_sensor_read_raw_hyst_value(
                         &gyro_state->common_attributes, val, val2);
-                ret_type = IIO_VAL_INT_PLUS_MICRO;
                 break;
         default:
                 ret_type = -EINVAL;
diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index f34c94380b41..96e71e103ea7 100644
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -79,7 +79,6 @@ static int als_read_raw(struct iio_dev *indio_dev,
         struct als_state *als_state = iio_priv(indio_dev);
         int report_id = -1;
         u32 address;
-        int ret;
         int ret_type;
         s32 poll_value;
 
@@ -129,14 +128,12 @@ static int als_read_raw(struct iio_dev *indio_dev,
                 ret_type = IIO_VAL_INT;
                 break;
         case IIO_CHAN_INFO_SAMP_FREQ:
-                ret = hid_sensor_read_samp_freq_value(
+                ret_type = hid_sensor_read_samp_freq_value(
                                 &als_state->common_attributes, val, val2);
-                ret_type = IIO_VAL_INT_PLUS_MICRO;
                 break;
         case IIO_CHAN_INFO_HYSTERESIS:
-                ret = hid_sensor_read_raw_hyst_value(
+                ret_type = hid_sensor_read_raw_hyst_value(
                                 &als_state->common_attributes, val, val2);
-                ret_type = IIO_VAL_INT_PLUS_MICRO;
                 break;
         default:
                 ret_type = -EINVAL;
diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c
index d203ef4d892f..412bae86d6ae 100644
--- a/drivers/iio/light/hid-sensor-prox.c
+++ b/drivers/iio/light/hid-sensor-prox.c
@@ -74,7 +74,6 @@ static int prox_read_raw(struct iio_dev *indio_dev,
         struct prox_state *prox_state = iio_priv(indio_dev);
         int report_id = -1;
         u32 address;
-        int ret;
         int ret_type;
         s32 poll_value;
 
@@ -125,14 +124,12 @@ static int prox_read_raw(struct iio_dev *indio_dev,
                 ret_type = IIO_VAL_INT;
                 break;
         case IIO_CHAN_INFO_SAMP_FREQ:
-                ret = hid_sensor_read_samp_freq_value(
+                ret_type = hid_sensor_read_samp_freq_value(
                                 &prox_state->common_attributes, val, val2);
-                ret_type = IIO_VAL_INT_PLUS_MICRO;
                 break;
         case IIO_CHAN_INFO_HYSTERESIS:
-                ret = hid_sensor_read_raw_hyst_value(
+                ret_type = hid_sensor_read_raw_hyst_value(
                                 &prox_state->common_attributes, val, val2);
-                ret_type = IIO_VAL_INT_PLUS_MICRO;
                 break;
         default:
                 ret_type = -EINVAL;
diff --git a/drivers/iio/light/tcs3472.c b/drivers/iio/light/tcs3472.c
index fe063a0a21cd..752569985d1d 100644
--- a/drivers/iio/light/tcs3472.c
+++ b/drivers/iio/light/tcs3472.c
@@ -52,6 +52,7 @@
 
 struct tcs3472_data {
         struct i2c_client *client;
+        struct mutex lock;
         u8 enable;
         u8 control;
         u8 atime;
@@ -116,10 +117,17 @@ static int tcs3472_read_raw(struct iio_dev *indio_dev,
 
         switch (mask) {
         case IIO_CHAN_INFO_RAW:
+                if (iio_buffer_enabled(indio_dev))
+                        return -EBUSY;
+
+                mutex_lock(&data->lock);
                 ret = tcs3472_req_data(data);
-                if (ret < 0)
+                if (ret < 0) {
+                        mutex_unlock(&data->lock);
                         return ret;
+                }
                 ret = i2c_smbus_read_word_data(data->client, chan->address);
+                mutex_unlock(&data->lock);
                 if (ret < 0)
                         return ret;
                 *val = ret;
@@ -255,6 +263,7 @@ static int tcs3472_probe(struct i2c_client *client,
         data = iio_priv(indio_dev);
         i2c_set_clientdata(client, indio_dev);
         data->client = client;
+        mutex_init(&data->lock);
 
         indio_dev->dev.parent = &client->dev;
         indio_dev->info = &tcs3472_info;
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index 41cf29e2a371..b2b0937d5133 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -110,7 +110,6 @@ static int magn_3d_read_raw(struct iio_dev *indio_dev,
         struct magn_3d_state *magn_state = iio_priv(indio_dev);
         int report_id = -1;
         u32 address;
-        int ret;
         int ret_type;
         s32 poll_value;
 
@@ -153,14 +152,12 @@ static int magn_3d_read_raw(struct iio_dev *indio_dev,
                 ret_type = IIO_VAL_INT;
                 break;
         case IIO_CHAN_INFO_SAMP_FREQ:
-                ret = hid_sensor_read_samp_freq_value(
+                ret_type = hid_sensor_read_samp_freq_value(
                         &magn_state->common_attributes, val, val2);
-                ret_type = IIO_VAL_INT_PLUS_MICRO;
                 break;
         case IIO_CHAN_INFO_HYSTERESIS:
-                ret = hid_sensor_read_raw_hyst_value(
+                ret_type = hid_sensor_read_raw_hyst_value(
                         &magn_state->common_attributes, val, val2);
-                ret_type = IIO_VAL_INT_PLUS_MICRO;
                 break;
         default:
                 ret_type = -EINVAL;
diff --git a/drivers/iio/pressure/hid-sensor-press.c b/drivers/iio/pressure/hid-sensor-press.c
index 1cd190c73788..2c0d2a4fed8c 100644
--- a/drivers/iio/pressure/hid-sensor-press.c
+++ b/drivers/iio/pressure/hid-sensor-press.c
@@ -78,7 +78,6 @@ static int press_read_raw(struct iio_dev *indio_dev,
         struct press_state *press_state = iio_priv(indio_dev);
         int report_id = -1;
         u32 address;
-        int ret;
         int ret_type;
         s32 poll_value;
 
@@ -128,14 +127,12 @@ static int press_read_raw(struct iio_dev *indio_dev,
                 ret_type = IIO_VAL_INT;
                 break;
         case IIO_CHAN_INFO_SAMP_FREQ:
-                ret = hid_sensor_read_samp_freq_value(
+                ret_type = hid_sensor_read_samp_freq_value(
                                 &press_state->common_attributes, val, val2);
-                ret_type = IIO_VAL_INT_PLUS_MICRO;
                 break;
         case IIO_CHAN_INFO_HYSTERESIS:
-                ret = hid_sensor_read_raw_hyst_value(
+                ret_type = hid_sensor_read_raw_hyst_value(
                                 &press_state->common_attributes, val, val2);
-                ret_type = IIO_VAL_INT_PLUS_MICRO;
                 break;
         default:
                 ret_type = -EINVAL;