Skip to content

L
linux
Commit 303f8ad1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'staging-3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull IIO fixes from Greg KH:
 "Here are some IIO driver fixes for 3.16-rc5.  Nothing major, just
  resolves some minor issues that have been reported"

* tag 'staging-3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  iio: ti_am335x_adc: Fix: Use same step id at FIFOs both ends
  iio:tcs3472: Check for buffer enabled and locking
  iio: hid-sensor-prox: Fix return values
  iio: hid-sensor-gyro-3d: Fix return values
  iio: hid-sensor-als: Fix return values
  iio: hid-sensor-magn-3d: Fix return values
  iio: hid-sensor-accel-3d: Fix return values
  iio: hid-sensor-press: Fix return values
parents 3a57cc5f bdac8ca9
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 32 deletions
drivers/iio/accel/hid-sensor-accel-3d.c
View file @ 303f8ad1
...@@ -110,7 +110,6 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev, ...@@ -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); struct accel_3d_state *accel_state = iio_priv(indio_dev);
int report_id = -1; int report_id = -1;
u32 address; u32 address;
int ret;
int ret_type; int ret_type;
s32 poll_value; s32 poll_value;
...@@ -151,14 +150,12 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev, ...@@ -151,14 +150,12 @@ static int accel_3d_read_raw(struct iio_dev *indio_dev,
ret_type = IIO_VAL_INT; ret_type = IIO_VAL_INT;
break; break;
case IIO_CHAN_INFO_SAMP_FREQ: 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); &accel_state->common_attributes, val, val2);
ret_type = IIO_VAL_INT_PLUS_MICRO;
break; break;
case IIO_CHAN_INFO_HYSTERESIS: 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); &accel_state->common_attributes, val, val2);
ret_type = IIO_VAL_INT_PLUS_MICRO;
break; break;
default: default:
ret_type = -EINVAL; ret_type = -EINVAL;
......
drivers/iio/adc/ti_am335x_adc.c
View file @ 303f8ad1
...@@ -374,7 +374,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev, ...@@ -374,7 +374,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
return -EAGAIN; 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 * We check the complete FIFO. We programmed just one entry but in case
......
drivers/iio/gyro/hid-sensor-gyro-3d.c
View file @ 303f8ad1
...@@ -110,7 +110,6 @@ static int gyro_3d_read_raw(struct iio_dev *indio_dev, ...@@ -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); struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
int report_id = -1; int report_id = -1;
u32 address; u32 address;
int ret;
int ret_type; int ret_type;
s32 poll_value; s32 poll_value;
...@@ -151,14 +150,12 @@ static int gyro_3d_read_raw(struct iio_dev *indio_dev, ...@@ -151,14 +150,12 @@ static int gyro_3d_read_raw(struct iio_dev *indio_dev,
ret_type = IIO_VAL_INT; ret_type = IIO_VAL_INT;
break; break;
case IIO_CHAN_INFO_SAMP_FREQ: 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); &gyro_state->common_attributes, val, val2);
ret_type = IIO_VAL_INT_PLUS_MICRO;
break; break;
case IIO_CHAN_INFO_HYSTERESIS: 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); &gyro_state->common_attributes, val, val2);
ret_type = IIO_VAL_INT_PLUS_MICRO;
break; break;
default: default:
ret_type = -EINVAL; ret_type = -EINVAL;
......
drivers/iio/light/hid-sensor-als.c
View file @ 303f8ad1
...@@ -79,7 +79,6 @@ static int als_read_raw(struct iio_dev *indio_dev, ...@@ -79,7 +79,6 @@ static int als_read_raw(struct iio_dev *indio_dev,
struct als_state *als_state = iio_priv(indio_dev); struct als_state *als_state = iio_priv(indio_dev);
int report_id = -1; int report_id = -1;
u32 address; u32 address;
int ret;
int ret_type; int ret_type;
s32 poll_value; s32 poll_value;
...@@ -129,14 +128,12 @@ static int als_read_raw(struct iio_dev *indio_dev, ...@@ -129,14 +128,12 @@ static int als_read_raw(struct iio_dev *indio_dev,
ret_type = IIO_VAL_INT; ret_type = IIO_VAL_INT;
break; break;
case IIO_CHAN_INFO_SAMP_FREQ: 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); &als_state->common_attributes, val, val2);
ret_type = IIO_VAL_INT_PLUS_MICRO;
break; break;
case IIO_CHAN_INFO_HYSTERESIS: 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); &als_state->common_attributes, val, val2);
ret_type = IIO_VAL_INT_PLUS_MICRO;
break; break;
default: default:
ret_type = -EINVAL; ret_type = -EINVAL;
......
drivers/iio/light/hid-sensor-prox.c
View file @ 303f8ad1
...@@ -74,7 +74,6 @@ static int prox_read_raw(struct iio_dev *indio_dev, ...@@ -74,7 +74,6 @@ static int prox_read_raw(struct iio_dev *indio_dev,
struct prox_state *prox_state = iio_priv(indio_dev); struct prox_state *prox_state = iio_priv(indio_dev);
int report_id = -1; int report_id = -1;
u32 address; u32 address;
int ret;
int ret_type; int ret_type;
s32 poll_value; s32 poll_value;
...@@ -125,14 +124,12 @@ static int prox_read_raw(struct iio_dev *indio_dev, ...@@ -125,14 +124,12 @@ static int prox_read_raw(struct iio_dev *indio_dev,
ret_type = IIO_VAL_INT; ret_type = IIO_VAL_INT;
break; break;
case IIO_CHAN_INFO_SAMP_FREQ: 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); &prox_state->common_attributes, val, val2);
ret_type = IIO_VAL_INT_PLUS_MICRO;
break; break;
case IIO_CHAN_INFO_HYSTERESIS: 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); &prox_state->common_attributes, val, val2);
ret_type = IIO_VAL_INT_PLUS_MICRO;
break; break;
default: default:
ret_type = -EINVAL; ret_type = -EINVAL;
......
drivers/iio/light/tcs3472.c
View file @ 303f8ad1
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
struct tcs3472_data { struct tcs3472_data {
struct i2c_client *client; struct i2c_client *client;
struct mutex lock;
u8 enable; u8 enable;
u8 control; u8 control;
u8 atime; u8 atime;
...@@ -116,10 +117,17 @@ static int tcs3472_read_raw(struct iio_dev *indio_dev, ...@@ -116,10 +117,17 @@ static int tcs3472_read_raw(struct iio_dev *indio_dev,
switch (mask) { switch (mask) {
case IIO_CHAN_INFO_RAW: case IIO_CHAN_INFO_RAW:
if (iio_buffer_enabled(indio_dev))
return -EBUSY;
mutex_lock(&data->lock);
ret = tcs3472_req_data(data); ret = tcs3472_req_data(data);
if (ret < 0) if (ret < 0) {
mutex_unlock(&data->lock);
return ret; return ret;
}
ret = i2c_smbus_read_word_data(data->client, chan->address); ret = i2c_smbus_read_word_data(data->client, chan->address);
mutex_unlock(&data->lock);
if (ret < 0) if (ret < 0)
return ret; return ret;
*val = ret; *val = ret;
...@@ -255,6 +263,7 @@ static int tcs3472_probe(struct i2c_client *client, ...@@ -255,6 +263,7 @@ static int tcs3472_probe(struct i2c_client *client,
data = iio_priv(indio_dev); data = iio_priv(indio_dev);
i2c_set_clientdata(client, indio_dev); i2c_set_clientdata(client, indio_dev);
data->client = client; data->client = client;
mutex_init(&data->lock);
indio_dev->dev.parent = &client->dev; indio_dev->dev.parent = &client->dev;
indio_dev->info = &tcs3472_info; indio_dev->info = &tcs3472_info;
......
drivers/iio/magnetometer/hid-sensor-magn-3d.c
View file @ 303f8ad1
...@@ -110,7 +110,6 @@ static int magn_3d_read_raw(struct iio_dev *indio_dev, ...@@ -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); struct magn_3d_state *magn_state = iio_priv(indio_dev);
int report_id = -1; int report_id = -1;
u32 address; u32 address;
int ret;
int ret_type; int ret_type;
s32 poll_value; s32 poll_value;
...@@ -153,14 +152,12 @@ static int magn_3d_read_raw(struct iio_dev *indio_dev, ...@@ -153,14 +152,12 @@ static int magn_3d_read_raw(struct iio_dev *indio_dev,
ret_type = IIO_VAL_INT; ret_type = IIO_VAL_INT;
break; break;
case IIO_CHAN_INFO_SAMP_FREQ: 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); &magn_state->common_attributes, val, val2);
ret_type = IIO_VAL_INT_PLUS_MICRO;
break; break;
case IIO_CHAN_INFO_HYSTERESIS: 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); &magn_state->common_attributes, val, val2);
ret_type = IIO_VAL_INT_PLUS_MICRO;
break; break;
default: default:
ret_type = -EINVAL; ret_type = -EINVAL;
......
drivers/iio/pressure/hid-sensor-press.c
View file @ 303f8ad1
...@@ -78,7 +78,6 @@ static int press_read_raw(struct iio_dev *indio_dev, ...@@ -78,7 +78,6 @@ static int press_read_raw(struct iio_dev *indio_dev,
struct press_state *press_state = iio_priv(indio_dev); struct press_state *press_state = iio_priv(indio_dev);
int report_id = -1; int report_id = -1;
u32 address; u32 address;
int ret;
int ret_type; int ret_type;
s32 poll_value; s32 poll_value;
...@@ -128,14 +127,12 @@ static int press_read_raw(struct iio_dev *indio_dev, ...@@ -128,14 +127,12 @@ static int press_read_raw(struct iio_dev *indio_dev,
ret_type = IIO_VAL_INT; ret_type = IIO_VAL_INT;
break; break;
case IIO_CHAN_INFO_SAMP_FREQ: 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); &press_state->common_attributes, val, val2);
ret_type = IIO_VAL_INT_PLUS_MICRO;
break; break;
case IIO_CHAN_INFO_HYSTERESIS: 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); &press_state->common_attributes, val, val2);
ret_type = IIO_VAL_INT_PLUS_MICRO;
break; break;
default: default:
ret_type = -EINVAL; ret_type = -EINVAL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7