Commit 5e802eed authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

iio: chemical: ens160: Stop using iio_device_claim_direct_scoped() 



This complex cleanup.h use case of conditional guards has proved
to be more trouble that it is worth in terms of false positive compiler
warnings and hard to read code.

Move directly to the new claim/release_direct() that allow sparse
to check for unbalanced context.

Reviewed-by: default avatarGustavo Silva <gustavograzs@gmail.com>
Reviewed-by: default avatarDavid Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20250209180624.701140-22-jic23@kernel.org


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent e4c56974

drivers/iio/chemical/ens160_core.c

+21 −11
Original line number Diff line number Diff line
@@ -100,16 +100,13 @@ static const struct iio_chan_spec ens160_channels[] = { 
	IIO_CHAN_SOFT_TIMESTAMP(2),

};



static int ens160_read_raw(struct iio_dev *indio_dev,

static int __ens160_read_raw(struct iio_dev *indio_dev,

			     struct iio_chan_spec const *chan,

			   int *val, int *val2, long mask)

			     int *val)

{

	struct ens160_data *data = iio_priv(indio_dev);

	int ret;



	switch (mask) {

	case IIO_CHAN_INFO_RAW:

		iio_device_claim_direct_scoped(return -EBUSY, indio_dev) {

	guard(mutex)(&data->mutex);

	ret = regmap_bulk_read(data->regmap, chan->address,

			       &data->buf, sizeof(data->buf));
@@ -118,7 +115,20 @@ static int ens160_read_raw(struct iio_dev *indio_dev, 
	*val = le16_to_cpu(data->buf);

	return IIO_VAL_INT;

}

		unreachable();



static int ens160_read_raw(struct iio_dev *indio_dev,

			   struct iio_chan_spec const *chan,

			   int *val, int *val2, long mask)

{

	int ret;



	switch (mask) {

	case IIO_CHAN_INFO_RAW:

		if (!iio_device_claim_direct(indio_dev))

			return -EBUSY;

		ret = __ens160_read_raw(indio_dev, chan, val);

		iio_device_release_direct(indio_dev);

		return ret;

	case IIO_CHAN_INFO_SCALE:

		switch (chan->channel2) {

		case IIO_MOD_CO2: