Re: [PATCH 186/606] iio: temperature: mlx90632: Convert to i2c's .probe_new()

[Crt Mori]

On Fri, 18 Nov 2022 at 23:46, Uwe Kleine-König <uwe@xxxxxxxxxxxxxxxxx> wrote:
>
> From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
>
> .probe_new() doesn't get the i2c_device_id * parameter, so determine
> that explicitly in the probe function.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> ---
>  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 mlx90632_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 = 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 = {
>                 .of_match_table = mlx90632_of_match,
>                 .pm     = pm_ptr(&mlx90632_pm_ops),
>         },
> +<<<<<<< ours

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

>         .probe = mlx90632_probe,
> +||||||| base
> +       .probe = mlx90632_probe,
> +       .remove = mlx90632_remove,
> +=======
> +       .probe_new = mlx90632_probe,
> +       .remove = mlx90632_remove,
> +>>>>>>> theirs
>         .id_table = mlx90632_id,
>  };
>  module_i2c_driver(mlx90632_driver);
> --
> 2.38.1
>