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;
MIME-Version: 1.0
References: <20221118224540.619276-1-uwe@kleine-koenig.org> <20221118224540.619276-187-uwe@kleine-koenig.org>
In-Reply-To: <20221118224540.619276-187-uwe@kleine-koenig.org>
From:   Crt Mori <cmo@melexis.com>
Date:   Sat, 19 Nov 2022 00:04:41 +0100
Message-ID: <CAKv63uvVsLhbt9y0fWxPWp005rnWzCn6Vm0UmOnW08B87fkCzw@mail.gmail.com>
Subject: Re: [PATCH 186/606] iio: temperature: mlx90632: Convert to i2c's .probe_new()
To:     =?UTF-8?Q?Uwe_Kleine=2DK=C3=B6nig?= <uwe@kleine-koenig.org>
Cc:     Angel Iglesias <ang.iglesiasg@gmail.com>,
        Lee Jones <lee.jones@linaro.org>,
        Grant Likely <grant.likely@linaro.org>,
        Wolfram Sang <wsa@kernel.org>,
        Jonathan Cameron <jic23@kernel.org>, linux-i2c@vger.kernel.org,
        kernel@pengutronix.de,
        =?UTF-8?Q?Uwe_Kleine=2DK=C3=B6nig?= 
        <u.kleine-koenig@pengutronix.de>,
        Lars-Peter Clausen <lars@metafoo.de>,
        linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, 18 Nov 2022 at 23:46, Uwe Kleine-K=C3=B6nig <uwe@kleine-koenig.org>=
 wrote:
>
> 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.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/temperature=
/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 mlx9063=
2_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(clien=
t);
>         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

Maybe some of the merge artifacts left (also below)?

>         .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);
> --
> 2.38.1
>