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

Commit 1bb86ecb authored by Alison Schofield's avatar Alison Schofield Committed by Jonathan Cameron
Browse files

iio: adc: ad799x: use iio helper function to guarantee direct mode 



Replace the code that guarantees the device stays in direct mode
with iio_device_claim_direct_mode() which does same.

Signed-off-by: default avatarAlison Schofield <amsfield22@gmail.com>
Acked-by: default avatarDaniel Baluta <daniel.baluta@gmail.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 9f57e068

drivers/iio/adc/ad799x.c

+9 −15
Original line number Original line Diff line number Diff line
@@ -282,12 +282,11 @@ static int ad799x_read_raw(struct iio_dev *indio_dev, 




	switch (m) {

	switch (m) {

	case IIO_CHAN_INFO_RAW:

	case IIO_CHAN_INFO_RAW:

		mutex_lock(&indio_dev->mlock);

		ret = iio_device_claim_direct_mode(indio_dev);

		if (iio_buffer_enabled(indio_dev))

		if (ret)

			ret = -EBUSY;

			return ret;

		else

		ret = ad799x_scan_direct(st, chan->scan_index);

		ret = ad799x_scan_direct(st, chan->scan_index);

		mutex_unlock(&indio_dev->mlock);

		iio_device_release_direct_mode(indio_dev);





		if (ret < 0)

		if (ret < 0)

			return ret;

			return ret;
@@ -395,11 +394,9 @@ static int ad799x_write_event_config(struct iio_dev *indio_dev, 
	struct ad799x_state *st = iio_priv(indio_dev);

	struct ad799x_state *st = iio_priv(indio_dev);

	int ret;

	int ret;





	mutex_lock(&indio_dev->mlock);

	ret = iio_device_claim_direct_mode(indio_dev);

	if (iio_buffer_enabled(indio_dev)) {

	if (ret)

		ret = -EBUSY;

		return ret;

		goto done;

	}





	if (state)

	if (state)

		st->config |= BIT(chan->scan_index) << AD799X_CHANNEL_SHIFT;

		st->config |= BIT(chan->scan_index) << AD799X_CHANNEL_SHIFT;
@@ -412,10 +409,7 @@ static int ad799x_write_event_config(struct iio_dev *indio_dev, 
		st->config &= ~AD7998_ALERT_EN;

		st->config &= ~AD7998_ALERT_EN;





	ret = ad799x_write_config(st, st->config);

	ret = ad799x_write_config(st, st->config);



	iio_device_release_direct_mode(indio_dev);

done:

	mutex_unlock(&indio_dev->mlock);



	return ret;

	return ret;

}

}