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:   Tue, 22 Nov 2022 18:35:57 +0000
From:   Jonathan Cameron <jic23@kernel.org>
To:     Crt Mori <cmo@melexis.com>
Cc:     Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= 
        <u.kleine-koenig@pengutronix.de>,
        Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= <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>
Subject: Re: [PATCH 186/606] iio: temperature: mlx90632: Convert to i2c's
 .probe_new()
Message-ID: <20221122183557.07a9e095@jic23-huawei>
In-Reply-To: <CAKv63uti8o2i-SFsJ7iK+R0N1go1tzVKpWZHbaRD3Wta2mXuZQ@mail.gmail.com>
References: <20221118224540.619276-1-uwe@kleine-koenig.org>
        <20221118224540.619276-187-uwe@kleine-koenig.org>
        <CAKv63uvVsLhbt9y0fWxPWp005rnWzCn6Vm0UmOnW08B87fkCzw@mail.gmail.com>
        <20221119100250.iw757ovgwjbwr2ho@pengutronix.de>
        <CAKv63uti8o2i-SFsJ7iK+R0N1go1tzVKpWZHbaRD3Wta2mXuZQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Sun, 20 Nov 2022 10:49:20 +0100
Crt Mori <cmo@melexis.com> wrote:

> Ok. Acked-by: Crt Mori <cmo@melexis.com>
> (resending since previous mail was not delivered because it was not plain=
text)
>=20
> On Sat, 19 Nov 2022 at 11:02, Uwe Kleine-K=C3=B6nig
> <u.kleine-koenig@pengutronix.de> wrote:
> >
> > Hello,
> >
> > On Sat, Nov 19, 2022 at 12:04:41AM +0100, Crt Mori wrote: =20
> > > On Fri, 18 Nov 2022 at 23:46, Uwe Kleine-K=C3=B6nig <uwe@kleine-koeni=
g.org> wrote: =20
> > > >
> > > > From: Uwe Kleine-K=C3=B6nig <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=C3=B6nig <u.kleine-koenig@pengutronix.d=
e>
> > > > ---
> > > >  drivers/iio/temperature/mlx90632.c | 12 ++++++++++--
> > > >  1 file changed, 10 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/drivers/iio/temperature/mlx90632.c b/drivers/iio/tempe=
rature/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 m=
lx90632_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=
(client);
> > > >         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)? =20
> >
> > *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/temperatu=
re/mlx90632.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, =20
> > ->>>>>>> theirs =20
> >         .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 :-)
Who would be crazy enough to do that?

(fixed up whilst applying)

Jonathan

> >
> > Best regards
> > Uwe
> >
> > --
> > Pengutronix e.K.                           | Uwe Kleine-K=C3=B6nig     =
       |
> > Industrial Linux Solutions                 | https://www.pengutronix.de=
/ | =20