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

iio: adc: max1363: 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 avatarDavid Lechner <dlechner@baylibre.com>
Reviewed-by: default avatarNuno Sa <nuno.sa@analog.com>
Link: https://patch.msgid.link/20250209180624.701140-17-jic23@kernel.org


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

drivers/iio/adc/max1363.c

+89 −76
Original line number Diff line number Diff line
@@ -364,7 +364,6 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev, 
				    int *val,

				    long m)

{

	iio_device_claim_direct_scoped(return -EBUSY, indio_dev) {

	s32 data;

	u8 rxbuf[2];

	struct max1363_state *st = iio_priv(indio_dev);
@@ -412,8 +411,6 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev, 


	return 0;

}

	unreachable();

}



static int max1363_read_raw(struct iio_dev *indio_dev,

			    struct iio_chan_spec const *chan,
@@ -426,7 +423,11 @@ static int max1363_read_raw(struct iio_dev *indio_dev, 


	switch (m) {

	case IIO_CHAN_INFO_RAW:

		if (!iio_device_claim_direct(indio_dev))

			return -EBUSY;



		ret = max1363_read_single_chan(indio_dev, chan, val, m);

		iio_device_release_direct(indio_dev);

		if (ret < 0)

			return ret;

		return IIO_VAL_INT;
@@ -947,13 +948,10 @@ static inline int __max1363_check_event_mask(int thismask, int checkmask) 
	return ret;

}



static int max1363_write_event_config(struct iio_dev *indio_dev,

	const struct iio_chan_spec *chan, enum iio_event_type type,

static int __max1363_write_event_config(struct max1363_state *st,

	const struct iio_chan_spec *chan,

	enum iio_event_direction dir, bool state)

{

	struct max1363_state *st = iio_priv(indio_dev);



	iio_device_claim_direct_scoped(return -EBUSY, indio_dev) {

	int number = chan->channel;

	u16 unifiedmask;

	int ret;
@@ -983,10 +981,25 @@ static int max1363_write_event_config(struct iio_dev *indio_dev, 
			st->mask_high |= (1 << number);

		}

	}



	return 0;



}

static int max1363_write_event_config(struct iio_dev *indio_dev,

	const struct iio_chan_spec *chan, enum iio_event_type type,

	enum iio_event_direction dir, bool state)

{

	struct max1363_state *st = iio_priv(indio_dev);

	int ret;



	if (!iio_device_claim_direct(indio_dev))

		return -EBUSY;



	ret = __max1363_write_event_config(st, chan,  dir, state);

	iio_device_release_direct(indio_dev);

	max1363_monitor_mode_update(st, !!(st->mask_high | st->mask_low));



	return 0;

	return ret;

}



/*