Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sat, 19 Nov 2022 11:02:50 +0100
From:   Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
To:     Crt Mori <cmo@melexis.com>
Cc:     Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= <uwe@kleine-koenig.org>,
        Lars-Peter Clausen <lars@metafoo.de>,
        linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
        Wolfram Sang <wsa@kernel.org>,
        Angel Iglesias <ang.iglesiasg@gmail.com>,
        linux-i2c@vger.kernel.org, kernel@pengutronix.de,
        Grant Likely <grant.likely@linaro.org>,
        Lee Jones <lee.jones@linaro.org>,
        Jonathan Cameron <jic23@kernel.org>
Subject: Re: [PATCH 186/606] iio: temperature: mlx90632: Convert to i2c's
 .probe_new()
Message-ID: <20221119100250.iw757ovgwjbwr2ho@pengutronix.de>
References: <20221118224540.619276-1-uwe@kleine-koenig.org>
 <20221118224540.619276-187-uwe@kleine-koenig.org>
 <CAKv63uvVsLhbt9y0fWxPWp005rnWzCn6Vm0UmOnW08B87fkCzw@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="hp5mb2d6k7mrzljq"
Content-Disposition: inline
In-Reply-To: <CAKv63uvVsLhbt9y0fWxPWp005rnWzCn6Vm0UmOnW08B87fkCzw@mail.gmail.com>
Precedence: bulk


--hp5mb2d6k7mrzljq
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hello,

On Sat, Nov 19, 2022 at 12:04:41AM +0100, Crt Mori wrote:
> On Fri, 18 Nov 2022 at 23:46, Uwe Kleine-K=F6nig <uwe@kleine-koenig.org> =
wrote:
> >
> > From: Uwe Kleine-K=F6nig <u.kleine-koenig@pengutronix.de>
> >
> > .probe_new() doesn't get the i2c_device_id * parameter, so determine
> > that explicitly in the probe function.
> >
> > Signed-off-by: Uwe Kleine-K=F6nig <u.kleine-koenig@pengutronix.de>
> > ---
> >  drivers/iio/temperature/mlx90632.c | 12 ++++++++++--
> >  1 file changed, 10 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/iio/temperature/mlx90632.c b/drivers/iio/temperatu=
re/mlx90632.c
> > index f1f5ebc145b1..19e30cfca8a7 100644
> > --- a/drivers/iio/temperature/mlx90632.c
> > +++ b/drivers/iio/temperature/mlx90632.c
> > @@ -1168,9 +1168,9 @@ static int mlx90632_enable_regulator(struct mlx90=
632_data *data)
> >         return ret;
> >  }
> >
> > -static int mlx90632_probe(struct i2c_client *client,
> > -                         const struct i2c_device_id *id)
> > +static int mlx90632_probe(struct i2c_client *client)
> >  {
> > +       const struct i2c_device_id *id =3D i2c_client_get_device_id(cli=
ent);
> >         struct mlx90632_data *mlx90632;
> >         struct iio_dev *indio_dev;
> >         struct regmap *regmap;
> > @@ -1337,7 +1337,15 @@ static struct i2c_driver mlx90632_driver =3D {
> >                 .of_match_table =3D mlx90632_of_match,
> >                 .pm     =3D pm_ptr(&mlx90632_pm_ops),
> >         },
> > +<<<<<<< ours
>=20
> Maybe some of the merge artifacts left (also below)?

*groan*, ok, thanks for pointing out the obvious. Fixed in my tree. Ftr,
the fixup is:

diff --git a/drivers/iio/temperature/mlx90632.c b/drivers/iio/temperature/m=
lx90632.c
index 19e30cfca8a7..753b7a4ccfdd 100644
--- a/drivers/iio/temperature/mlx90632.c
+++ b/drivers/iio/temperature/mlx90632.c
@@ -1337,15 +1337,7 @@ static struct i2c_driver mlx90632_driver =3D {
 		.of_match_table =3D mlx90632_of_match,
 		.pm	=3D pm_ptr(&mlx90632_pm_ops),
 	},
-<<<<<<< ours
-	.probe =3D mlx90632_probe,
-||||||| base
-	.probe =3D mlx90632_probe,
-	.remove =3D mlx90632_remove,
-=3D=3D=3D=3D=3D=3D=3D
 	.probe_new =3D mlx90632_probe,
-	.remove =3D mlx90632_remove,
->>>>>>> theirs
 	.id_table =3D mlx90632_id,
 };
 module_i2c_driver(mlx90632_driver);

When (and if) I'll resend the series, the fixed version will be
included. (Unless someone picks up the broken patch with the above
fixup of course :-)

Best regards
Uwe

--=20
Pengutronix e.K.                           | Uwe Kleine-K=F6nig            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

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

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

iQEzBAABCgAdFiEEfnIqFpAYrP8+dKQLwfwUeK3K7AkFAmN4qccACgkQwfwUeK3K
7AlCtQf8CxtG6vuDNnXN8vBGpjT/PQQsixyChegKXC+2lHfz6/xOl3dekciIonD1
MN6LBdeVd2qHQgWW4gKxPxvxOPscWj5MF++LvxdSd8EjUgVGdvLB2nC+n6HVATuq
GMOwkO1X64M7eqvXM+XKCehWVYAx4dKgGYceEeKSWIxLbHr39+Q1mRVvOXyuKobM
K4c7TCcZXHhwjtMKIqnG9DIpclJ0fTxT0xkgjn2rj3u4oUpQexjaSdIWE2oRzmvA
lzA2HzdZDEeeNk6bgBnNiCUfVeOcExMkx7LgUOPntH5sj1tPTFYaG0jUGEA42xK2
afoznodF/Zt4fW1nbJkWJs3tWfyVIw==
=wkQl
-----END PGP SIGNATURE-----

--hp5mb2d6k7mrzljq--