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

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

drivers/iio/accel/hid-sensor-accel-3d.c

+2 −5
Original line number Diff line number Diff line
@@ -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;

drivers/iio/adc/ti_am335x_adc.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/iio/gyro/hid-sensor-gyro-3d.c

+2 −5
Original line number Diff line number Diff line
@@ -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;

drivers/iio/light/hid-sensor-als.c

+2 −5
Original line number Diff line number Diff line
@@ -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;

drivers/iio/light/hid-sensor-prox.c

+2 −5
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE