Re: [PATCH v3 1/2] iio: vcnl4000: Use a single return when getting IIO_CHAN_INFO_RAW

From: Jonathan Cameron <jic23@kernel.org>
To: "Guido Günther" <agx@sigxcpu.org>
Cc: Tomas Novotny <tomas@novotny.cz>,
	Hartmut Knaack <knaack.h@gmx.de>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
	"Angus Ainslie (Purism)" <angus@akkea.ca>,
	Marco Felsch <m.felsch@pengutronix.de>,
	Thomas Gleixner <tglx@linutronix.de>,
	linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 1/2] iio: vcnl4000: Use a single return when getting IIO_CHAN_INFO_RAW
Date: Thu, 6 Feb 2020 11:24:50 +0000	[thread overview]
Message-ID: <20200206112450.04004361@archlinux> (raw)
In-Reply-To: <86e272aaf6726d6d5171445e7f2df6cdbb74057f.1580721204.git.agx@sigxcpu.org>

On Mon,  3 Feb 2020 10:17:01 +0100
Guido Günther <agx@sigxcpu.org> wrote:

> This will be useful when introducing runtime pm.
> 
> Signed-off-by: Guido Günther <agx@sigxcpu.org>
Applied.

Thanks,

Jonathan

> ---
>  drivers/iio/light/vcnl4000.c | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
> index b0e241aaefb4..8f198383626b 100644
> --- a/drivers/iio/light/vcnl4000.c
> +++ b/drivers/iio/light/vcnl4000.c
> @@ -335,17 +335,18 @@ static int vcnl4000_read_raw(struct iio_dev *indio_dev,
>  		switch (chan->type) {
>  		case IIO_LIGHT:
>  			ret = data->chip_spec->measure_light(data, val);
> -			if (ret < 0)
> -				return ret;
> -			return IIO_VAL_INT;
> +			if (!ret)
> +				ret = IIO_VAL_INT;
> +			break;
>  		case IIO_PROXIMITY:
>  			ret = data->chip_spec->measure_proximity(data, val);
> -			if (ret < 0)
> -				return ret;
> -			return IIO_VAL_INT;
> +			if (!ret)
> +				ret = IIO_VAL_INT;
> +			break;
>  		default:
> -			return -EINVAL;
> +			ret = -EINVAL;
>  		}
> +		return ret;
>  	case IIO_CHAN_INFO_SCALE:
>  		if (chan->type != IIO_LIGHT)
>  			return -EINVAL;