[PATCH 0/2] iio: simplify return statements

[PATCH 0/2] iio: simplify return statements

[Antoniu Miclaus]

Minor cleanups across two IIO drivers to simplify return paths by
removing unnecessary intermediate variable assignments before returning
error codes.

Antoniu Miclaus (2):
  iio: adc: ad7266: simplify error return
  iio: addac: ad74413r: simplify timeout return

 drivers/iio/adc/ad7266.c     | 6 ++----
 drivers/iio/addac/ad74413r.c | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

-- 
2.43.0

[PATCH 1/2] iio: adc: ad7266: simplify error return

[Antoniu Miclaus]

Return PTR_ERR() directly instead of assigning it to an intermediate
variable first.

Signed-off-by: Antoniu Miclaus <antoniu.miclaus@analog.com>
---
 drivers/iio/adc/ad7266.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index 3364ac6c4631..0ef36c249ab8 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -409,10 +409,8 @@ static int ad7266_probe(struct spi_device *spi)
 				st->gpios[i] = devm_gpiod_get(&spi->dev,
 						      ad7266_gpio_labels[i],
 						      GPIOD_OUT_LOW);
-				if (IS_ERR(st->gpios[i])) {
-					ret = PTR_ERR(st->gpios[i]);
-					return ret;
-				}
+				if (IS_ERR(st->gpios[i]))
+					return PTR_ERR(st->gpios[i]);
 			}
 		}
 	} else {
-- 
2.43.0

[PATCH 2/2] iio: addac: ad74413r: simplify timeout return

[Antoniu Miclaus]

Return -ETIMEDOUT directly instead of assigning it to an intermediate
variable first.

Signed-off-by: Antoniu Miclaus <antoniu.miclaus@analog.com>
---
 drivers/iio/addac/ad74413r.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/addac/ad74413r.c b/drivers/iio/addac/ad74413r.c
index a20b4d48c5f7..b1cf8a011277 100644
--- a/drivers/iio/addac/ad74413r.c
+++ b/drivers/iio/addac/ad74413r.c
@@ -841,10 +841,8 @@ static int _ad74413r_get_single_adc_result(struct ad74413r_state *st,
 
 	ret = wait_for_completion_timeout(&st->adc_data_completion,
 					  msecs_to_jiffies(1000));
-	if (!ret) {
-		ret = -ETIMEDOUT;
-		return ret;
-	}
+	if (!ret)
+		return -ETIMEDOUT;
 
 	ret = regmap_read(st->regmap, AD74413R_REG_ADC_RESULT_X(channel),
 			  &uval);
-- 
2.43.0

Re: [PATCH 2/2] iio: addac: ad74413r: simplify timeout return

[Andy Shevchenko]

On Fri, Feb 20, 2026 at 03:18:47PM +0200, Antoniu Miclaus wrote:
> Return -ETIMEDOUT directly instead of assigning it to an intermediate
> variable first.

...

>  	ret = wait_for_completion_timeout(&st->adc_data_completion,
>  					  msecs_to_jiffies(1000));
> -	if (!ret) {
> -		ret = -ETIMEDOUT;
> -		return ret;
> -	}
> +	if (!ret)
> +		return -ETIMEDOUT;

I would prefer to have just

	if (!wait_for_completion_timeout(&st->adc_data_completion,
					 msecs_to_jiffies(1000)))
		return -ETIMEDOUT;

Using ret in a different semantics might lead to subtle issues in case some
code sneaks in and out of a sudden will recognize positive value as something
else.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 1/2] iio: adc: ad7266: simplify error return

[Andy Shevchenko]

On Fri, Feb 20, 2026 at 03:18:46PM +0200, Antoniu Miclaus wrote:
> Return PTR_ERR() directly instead of assigning it to an intermediate
> variable first.

Definitely!
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 1/2] iio: adc: ad7266: simplify error return

[Jonathan Cameron]

On Fri, 20 Feb 2026 16:09:08 +0200
Andy Shevchenko <andriy.shevchenko@intel.com> wrote:

> On Fri, Feb 20, 2026 at 03:18:46PM +0200, Antoniu Miclaus wrote:
> > Return PTR_ERR() directly instead of assigning it to an intermediate
> > variable first.  
> 
> Definitely!
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Applied.
>