Skip to content

Commit

Permalink
Merge tag 'staging-3.16-rc5' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history 
…rnel/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
  • Loading branch information
@torvalds
torvalds committed Jul 12, 2014
2 parents 3a57cc5 + bdac8ca commit 303f8ad
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 32 deletions.
7 changes: 2 additions & 5 deletions drivers/iio/accel/hid-sensor-accel-3d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/iio/adc/ti_am335x_adc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions drivers/iio/gyro/hid-sensor-gyro-3d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
7 changes: 2 additions & 5 deletions drivers/iio/light/hid-sensor-als.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
7 changes: 2 additions & 5 deletions drivers/iio/light/hid-sensor-prox.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
11 changes: 10 additions & 1 deletion drivers/iio/light/tcs3472.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@

struct tcs3472_data {
struct i2c_client *client;
struct mutex lock;
u8 enable;
u8 control;
u8 atime;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
7 changes: 2 additions & 5 deletions drivers/iio/magnetometer/hid-sensor-magn-3d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
7 changes: 2 additions & 5 deletions drivers/iio/pressure/hid-sensor-press.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 303f8ad

Please sign in to comment.