mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@intel.com>
To: raffaele.tranfaglia@gmail.com
Cc: "Nuno Sá" <nuno.sa@analog.com>,
	"Michael Hennerich" <Michael.Hennerich@analog.com>,
	"Jonathan Cameron" <jic23@kernel.org>,
	"David Lechner" <dlechner@baylibre.com>,
	"Andy Shevchenko" <andy@kernel.org>,
	linux@analog.com, linux-iio@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/2] iio: light: adux1020: return early on unsupported channel types
Date: Tue, 17 Nov 2026 21:06:21 +0200	[thread overview]
Message-ID: <avylrU1cexaQp1mM@ashevche-desk.local> (raw)
In-Reply-To: <20261117-adux1020-guard-v2-2-89707fa070c9@gmail.com>

On Tue, Nov 17, 2026 at 07:11:02AM +0000, Raffaele Tranfaglia via B4 Relay wrote:
> 
> Now that adux1020_read_raw() and adux1020_write_raw() can return
> directly, check the channel type with an inverted condition and return
> -EINVAL early instead of nesting the work in an inner switch or if
> block. This removes one level of indentation and makes the two
> functions consistent with each other.
> 
> While at it, drop the stray semicolon after the closing brace of
> adux1020_read_raw().
> 
> No functional change intended.

...

> static int adux1020_read_raw(struct iio_dev *indio_dev,

	struct regmap *map = data->regmap;

>  	switch (mask) {
>  	case IIO_CHAN_INFO_RAW:
> -		switch (chan->type) {
> -		case IIO_PROXIMITY:
> -			ret = adux1020_set_mode(data, ADUX1020_MODE_PROX_I);
> -			if (ret < 0)
> -				return ret;
> -
> -			ret = adux1020_measure(data, ADUX1020_MODE_PROX_I, buf);
> -			if (ret < 0)
> -				return ret;
> -
> -			*val = buf[0];
> -			return IIO_VAL_INT;
> -		default:
> +		if (chan->type != IIO_PROXIMITY)
>  			return -EINVAL;
> -		}
> -	case IIO_CHAN_INFO_PROCESSED:
> -		switch (chan->type) {
> -		case IIO_CURRENT:
> -			ret = regmap_read(data->regmap,
> -					  ADUX1020_REG_LED_CURRENT, &regval);
> -			if (ret < 0)
> -				return ret;
>  
> -			regval = regval & ADUX1020_LED_CURRENT_MASK;
> +		ret = adux1020_set_mode(data, ADUX1020_MODE_PROX_I);
> +		if (ret < 0)
> +			return ret;
> +
> +		ret = adux1020_measure(data, ADUX1020_MODE_PROX_I, buf);
> +		if (ret < 0)
> +			return ret;
>  
> -			*val = adux1020_led_currents[regval][0];
> -			*val2 = adux1020_led_currents[regval][1];
> +		*val = buf[0];
>  
> -			return IIO_VAL_INT_PLUS_MICRO;
> -		default:
> +		return IIO_VAL_INT;
> +	case IIO_CHAN_INFO_PROCESSED:
> +		if (chan->type != IIO_CURRENT)
>  			return -EINVAL;
> -		}
> +
> +		ret = regmap_read(data->regmap, ADUX1020_REG_LED_CURRENT,
> +				  &regval);

		ret = regmap_read(map, ADUX1020_REG_LED_CURRENT, &regval);

> +		if (ret < 0)

While at it, drop ' < 0' parts for regmap error codes.

> +			return ret;
> +
> +		regval = regval & ADUX1020_LED_CURRENT_MASK;
> +
> +		*val = adux1020_led_currents[regval][0];
> +		*val2 = adux1020_led_currents[regval][1];
> +
> +		return IIO_VAL_INT_PLUS_MICRO;
>  	case IIO_CHAN_INFO_SAMP_FREQ:
> -		switch (chan->type) {
> -		case IIO_PROXIMITY:
> -			ret = regmap_read(data->regmap, ADUX1020_REG_FREQUENCY,
> -					  &regval);
> -			if (ret < 0)
> -				return ret;
> -
> -			regval = FIELD_GET(ADUX1020_PROX_FREQ_MASK, regval);
> -			if (regval >= ARRAY_SIZE(adux1020_rates))
> -				return -EINVAL;
> -
> -			*val = adux1020_rates[regval][0];
> -			*val2 = adux1020_rates[regval][1];
> -
> -			return IIO_VAL_INT_PLUS_MICRO;
> -		default:
> +		if (chan->type != IIO_PROXIMITY)
>  			return -EINVAL;
> -		}

> +		ret = regmap_read(data->regmap, ADUX1020_REG_FREQUENCY,
> +				  &regval);
> +		if (ret < 0)
> +			return ret;

Ditto.

> +		regval = FIELD_GET(ADUX1020_PROX_FREQ_MASK, regval);
> +		if (regval >= ARRAY_SIZE(adux1020_rates))
> +			return -EINVAL;
> +
> +		*val = adux1020_rates[regval][0];
> +		*val2 = adux1020_rates[regval][1];
> +
> +		return IIO_VAL_INT_PLUS_MICRO;
>  	default:
>  		return -EINVAL;
>  	}

> -};
> +}

Strictly speaking this doesn't belong to the patch, but since it's intrusive
enough and the change is in the same (touched) function I don't mind it be
here.

...

> static int adux1020_write_raw(struct iio_dev *indio_dev,

>  	switch (mask) {
>  	case IIO_CHAN_INFO_SAMP_FREQ:
> -		if (chan->type == IIO_PROXIMITY) {
> -			i = adux1020_find_index(adux1020_rates,
> -						ARRAY_SIZE(adux1020_rates),
> -						val, val2);
> -			if (i < 0)
> -				return i;
> -
> -			return regmap_update_bits(data->regmap,
> -						  ADUX1020_REG_FREQUENCY,
> -						  ADUX1020_PROX_FREQ_MASK,
> -						  ADUX1020_PROX_FREQ(i));
> -		}
> -		break;
> +		if (chan->type != IIO_PROXIMITY)
> +			return -EINVAL;
> +
> +		i = adux1020_find_index(adux1020_rates,
> +					ARRAY_SIZE(adux1020_rates), val, val2);

Split logically.

		i = adux1020_find_index(adux1020_rates,
					ARRAY_SIZE(adux1020_rates),
					val, val2);

or make the first line longer

		i = adux1020_find_index(adux1020_rates, ARRAY_SIZE(adux1020_rates),
					val, val2);

> +		if (i < 0)
> +			return i;
> +
> +		return regmap_update_bits(data->regmap, ADUX1020_REG_FREQUENCY,
> +					  ADUX1020_PROX_FREQ_MASK,
> +					  ADUX1020_PROX_FREQ(i));
>  	case IIO_CHAN_INFO_PROCESSED:
> -		if (chan->type == IIO_CURRENT) {
> -			i = adux1020_find_index(adux1020_led_currents,
> +		if (chan->type != IIO_CURRENT)
> +			return -EINVAL;
> +
> +		i = adux1020_find_index(adux1020_led_currents,
>  					ARRAY_SIZE(adux1020_led_currents),
>  					val, val2);
> -			if (i < 0)
> -				return i;
> +		if (i < 0)
> +			return i;
>  
> -			return regmap_update_bits(data->regmap,
> -						  ADUX1020_REG_LED_CURRENT,
> -						  ADUX1020_LED_CURRENT_MASK, i);
> -		}
> -		break;
> +		return regmap_update_bits(data->regmap,
> +					  ADUX1020_REG_LED_CURRENT,
> +					  ADUX1020_LED_CURRENT_MASK, i);
>  	default:
> -		break;
> +		return -EINVAL;
>  	}
> -
> -	return -EINVAL;
>  }

-- 
With Best Regards,
Andy Shevchenko



      reply	other threads:[~2026-11-17 19:06 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17  7:11 [PATCH v2 0/2] iio: light: adux1020: guard() conversion and follow-up cleanup Raffaele Tranfaglia via B4 Relay
2026-11-17  7:11 ` [PATCH v2 1/2] iio: light: adux1020: use guard() to simplify lock handling Raffaele Tranfaglia via B4 Relay
2026-11-17  7:11 ` [PATCH v2 2/2] iio: light: adux1020: return early on unsupported channel types Raffaele Tranfaglia via B4 Relay
2026-11-17 19:06   ` Andy Shevchenko [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=avylrU1cexaQp1mM@ashevche-desk.local \
    --to=andriy.shevchenko@intel.com \
    --cc=Michael.Hennerich@analog.com \
    --cc=andy@kernel.org \
    --cc=dlechner@baylibre.com \
    --cc=jic23@kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@analog.com \
    --cc=nuno.sa@analog.com \
    --cc=raffaele.tranfaglia@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®