Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
Date:   Sun, 10 Dec 2023 14:44:40 +0100
From:   Marcus Folkesson <marcus.folkesson@gmail.com>
To:     Jonathan Cameron <jic23@kernel.org>
Cc:     Kent Gustavsson <kent@minoris.se>,
        Lars-Peter Clausen <lars@metafoo.de>,
        linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v4] iio: adc: mcp3911: simplify code with guard macro
Message-ID: <ZXXAyEkA55MFw5iH@gmail.com>
References: <20231206-mcp3911-guard-v4-1-30c3c5d4340f@gmail.com>
 <20231210113632.7880e730@jic23-huawei>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="ivf6EFFOCMSRLL93"
Content-Disposition: inline
In-Reply-To: <20231210113632.7880e730@jic23-huawei>
Precedence: bulk


--ivf6EFFOCMSRLL93
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Dec 10, 2023 at 11:36:32AM +0000, Jonathan Cameron wrote:
> On Wed, 06 Dec 2023 19:39:04 +0100
> Marcus Folkesson <marcus.folkesson@gmail.com> wrote:
>=20
> > Use the guard(mutex) macro for handle mutex lock/unlocks.
> >=20
> > Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
> Various changes inline - most are focused around simplifying the
> path for any given flow through the code.
>=20
> Rather than going for a v5 - I've applied this with the following diff on=
 top
> diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
> index dfcb6cb7570f..7a32e7a1be9d 100644
> --- a/drivers/iio/adc/mcp3911.c
> +++ b/drivers/iio/adc/mcp3911.c
> @@ -317,7 +317,7 @@ static int mcp3911_read_raw(struct iio_dev *indio_dev,
>                             int *val2, long mask)
>  {
>         struct mcp3911 *adc =3D iio_priv(indio_dev);
> -       int ret =3D -EINVAL;
> +       int ret;
> =20
>         guard(mutex)(&adc->lock);
>         switch (mask) {
> @@ -331,17 +331,23 @@ static int mcp3911_read_raw(struct iio_dev *indio_d=
ev,
>                 return IIO_VAL_INT;
>         case IIO_CHAN_INFO_OFFSET:
>                 ret =3D adc->chip->get_offset(adc, channel->channel, val);
> -               return (ret) ? ret : IIO_VAL_INT;
> +               if (ret)
> +                       return ret;
> +
> +               return IIO_VAL_INT;
>         case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
>                 ret =3D adc->chip->get_osr(adc, val);
> -               return (ret) ? ret : IIO_VAL_INT;
> +               if (ret)
> +                       return ret;
> +
> +               return IIO_VAL_INT;
>         case IIO_CHAN_INFO_SCALE:
>                 *val =3D mcp3911_scale_table[ilog2(adc->gain[channel->cha=
nnel])][0];
>                 *val2 =3D mcp3911_scale_table[ilog2(adc->gain[channel->ch=
annel])][1];
>                 return IIO_VAL_INT_PLUS_NANO;
> +       default:
> +               return -EINVAL;
>         }
> -
> -       return ret;
>  }
> =20
>  static int mcp3911_write_raw(struct iio_dev *indio_dev,
> @@ -361,7 +367,7 @@ static int mcp3911_write_raw(struct iio_dev *indio_de=
v,
>                                 return adc->chip->set_scale(adc, channel-=
>channel, i);
>                         }
>                 }
> -               break;
> +               return -EINVAL;
>         case IIO_CHAN_INFO_OFFSET:
>                 if (val2 !=3D 0)
>                         return -EINVAL;
> @@ -373,9 +379,10 @@ static int mcp3911_write_raw(struct iio_dev *indio_d=
ev,
>                                 return adc->chip->set_osr(adc, i);
>                         }
>                 }
> -               break;
> +               return -EINVAL;
> +       default:
> +               return -EINVAL;
>         }
> -       return -EINVAL;
>  }
>=20
> hope that's ok with you!

Thank you Jonathan

Best regards
Marcus Folkesson

--ivf6EFFOCMSRLL93
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEBVGi6LZstU1kwSxliIBOb1ldUjIFAmV1wMMACgkQiIBOb1ld
UjJJWg//d6A7m1jCTld/R+jAvYfBNLAYcxBNWWyKbzA1wOsQwt9VLpFdxMdB/HfC
egZxUaQB4MyA9xSBkS9vWqDZUt8+YujOW/cND15evJKokbXUXSEXxOjinU01ZNyL
3gMIHNoyYMXzI26R8IvZ8T/xAp5B3KzY28DOmYYahnKePdCMlnfia/H0qYYEgy8h
IUeLZwGHIb+rW6k4TWiUKfDWQxUBUk+TMqKBkQShPBYjlzJf8Xp3OTf2YEtHDZNn
SaC0rMVrsAuFGCYTkZKWJs+ctkb6tivyR5EeT5+pqNMhUZwh601hK+pGYvcC9791
qJg7GQqynquiDyaTLk9jv3gSNgu9mvBBuszEb2vCyWX5fSEyRYzeKedqJZMecUFe
bln0n1gpxJ1E/mX69+5cMt0/nGb1+j8vLzHLeVtCVRTrAFYDn3a5nfdz2ftY27mQ
85BZ2Fy21YzvRYBam/Mhq3ZLSdCknekcb4OnYKpN9+zgIwLrdE8i4lbjm052R4Pi
BdTxeqDoCsvL0nv62xBe3+fETijpC++Cc5sWnAo95JPybxk5ntO5iRbCwnM/fBgy
Xc+9JB/RYrhMWt1wcvSYNzkKZl+jIZH4NSzZU9XBAakqlcvkwI+aicj8EPjdiOH2
y4Xo1TEcwHxLHW3L5ky29PIkBE+HSogJEpiPXiftiYdLV7uHSSM=
=fRkE
-----END PGP SIGNATURE-----

--ivf6EFFOCMSRLL93--