Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73149bad authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron
Browse files

staging:iio:adis16260: Simplify calibscale and caliboffset reading 



All channels for this device have the same number of bits for calibscale and
caliboffset, there is no need to determine it dynamically based on the channel
type. Also there is no locking required since adis_read_reg_16() will take care
of proper locking on its own.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent b45ae32b

drivers/staging/iio/gyro/adis16260_core.c

+5 −26
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ static int adis16260_read_raw(struct iio_dev *indio_dev, 
{

	struct adis *adis = iio_priv(indio_dev);

	int ret;

	int bits;

	u8 addr;

	s16 val16;
@@ -263,40 +262,20 @@ static int adis16260_read_raw(struct iio_dev *indio_dev, 
		*val = 250000 / 1453; /* 25 C = 0x00 */

		return IIO_VAL_INT;

	case IIO_CHAN_INFO_CALIBBIAS:

		switch (chan->type) {

		case IIO_ANGL_VEL:

			bits = 12;

			break;

		default:

			return -EINVAL;

		}

		mutex_lock(&indio_dev->mlock);

		addr = adis16260_addresses[chan->scan_index][0];

		ret = adis_read_reg_16(adis, addr, &val16);

		if (ret) {

			mutex_unlock(&indio_dev->mlock);

		if (ret)

			return ret;

		}

		*val = sign_extend32(val16, bits - 1);

		mutex_unlock(&indio_dev->mlock);



		*val = sign_extend32(val16, 11);

		return IIO_VAL_INT;

	case IIO_CHAN_INFO_CALIBSCALE:

		switch (chan->type) {

		case IIO_ANGL_VEL:

			bits = 12;

			break;

		default:

			return -EINVAL;

		}

		mutex_lock(&indio_dev->mlock);

		addr = adis16260_addresses[chan->scan_index][1];

		ret = adis_read_reg_16(adis, addr, &val16);

		if (ret) {

			mutex_unlock(&indio_dev->mlock);

		if (ret)

			return ret;

		}



		*val = val16;

		mutex_unlock(&indio_dev->mlock);

		return IIO_VAL_INT;

	}

	return -EINVAL;