Re: [PATCH 012/606] gpio: pca953x: Convert to i2c's .probe_new()

From: Bartosz Golaszewski
Date: Wed Nov 23 2022 - 04:52:26 EST


On Fri, Nov 18, 2022 at 11:46 PM 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/gpio/gpio-pca953x.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
> index 6e67867e1dcd..a59d61cd44b2 100644
> --- a/drivers/gpio/gpio-pca953x.c
> +++ b/drivers/gpio/gpio-pca953x.c
> @@ -1050,9 +1050,9 @@ static int device_pca957x_init(struct pca953x_chip *chip, u32 invert)
> return ret;
> }
>
> -static int pca953x_probe(struct i2c_client *client,
> - const struct i2c_device_id *i2c_id)
> +static int pca953x_probe(struct i2c_client *client)
> {
> + const struct i2c_device_id *i2c_id = i2c_client_get_device_id(client);
> struct pca953x_platform_data *pdata;
> struct pca953x_chip *chip;
> int irq_base = 0;
> @@ -1376,7 +1376,7 @@ static struct i2c_driver pca953x_driver = {
> .of_match_table = pca953x_dt_ids,
> .acpi_match_table = pca953x_acpi_ids,
> },
> - .probe = pca953x_probe,
> + .probe_new = pca953x_probe,
> .remove = pca953x_remove,
> .id_table = pca953x_id,
> };
> --
> 2.38.1
>

Applied, thanks!

Bartosz