diff mbox series

[013/606] gpio: pcf857x: Convert to i2c's .probe_new()

Message ID 20221118224540.619276-14-uwe@kleine-koenig.org
State New
Headers
Series i2c: Complete conversion to i2c_probe_new |

Commit Message

Uwe Kleine-König Nov. 18, 2022, 10:35 p.m. UTC 
  From: Uwe Kleine-König <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önig <u.kleine-koenig@pengutronix.de>
---
 drivers/gpio/gpio-pcf857x.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Bartosz Golaszewski Nov. 23, 2022, 9:48 a.m. UTC | #1 
On Fri, Nov 18, 2022 at 11:46 PM Uwe Kleine-König <uwe@kleine-koenig.org> wrote:
>
> From: Uwe Kleine-König <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önig <u.kleine-koenig@pengutronix.de>
> ---
>  drivers/gpio/gpio-pcf857x.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
> index e98ea47d7237..cec2f2c78255 100644
> --- a/drivers/gpio/gpio-pcf857x.c
> +++ b/drivers/gpio/gpio-pcf857x.c
> @@ -247,9 +247,9 @@ static const struct irq_chip pcf857x_irq_chip = {
>
>  /*-------------------------------------------------------------------------*/
>
> -static int pcf857x_probe(struct i2c_client *client,
> -                        const struct i2c_device_id *id)
> +static int pcf857x_probe(struct i2c_client *client)
>  {
> +       const struct i2c_device_id *id = i2c_client_get_device_id(client);
>         struct pcf857x_platform_data    *pdata = dev_get_platdata(&client->dev);
>         struct device_node              *np = client->dev.of_node;
>         struct pcf857x                  *gpio;
> @@ -422,7 +422,7 @@ static struct i2c_driver pcf857x_driver = {
>                 .name   = "pcf857x",
>                 .of_match_table = of_match_ptr(pcf857x_of_table),
>         },
> -       .probe  = pcf857x_probe,
> +       .probe_new = pcf857x_probe,
>         .remove = pcf857x_remove,
>         .shutdown = pcf857x_shutdown,
>         .id_table = pcf857x_id,
> --
> 2.38.1
>

Applied, thanks!

Bartosz
Bartosz Golaszewski Nov. 23, 2022, 3:50 p.m. UTC | #2 
On Wed, Nov 23, 2022 at 10:48 AM Bartosz Golaszewski <brgl@bgdev.pl> wrote:
>
> On Fri, Nov 18, 2022 at 11:46 PM Uwe Kleine-König <uwe@kleine-koenig.org> wrote:
> >
> > From: Uwe Kleine-König <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önig <u.kleine-koenig@pengutronix.de>
> > ---
> >  drivers/gpio/gpio-pcf857x.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
> > index e98ea47d7237..cec2f2c78255 100644
> > --- a/drivers/gpio/gpio-pcf857x.c
> > +++ b/drivers/gpio/gpio-pcf857x.c
> > @@ -247,9 +247,9 @@ static const struct irq_chip pcf857x_irq_chip = {
> >
> >  /*-------------------------------------------------------------------------*/
> >
> > -static int pcf857x_probe(struct i2c_client *client,
> > -                        const struct i2c_device_id *id)
> > +static int pcf857x_probe(struct i2c_client *client)
> >  {
> > +       const struct i2c_device_id *id = i2c_client_get_device_id(client);
> >         struct pcf857x_platform_data    *pdata = dev_get_platdata(&client->dev);
> >         struct device_node              *np = client->dev.of_node;
> >         struct pcf857x                  *gpio;
> > @@ -422,7 +422,7 @@ static struct i2c_driver pcf857x_driver = {
> >                 .name   = "pcf857x",
> >                 .of_match_table = of_match_ptr(pcf857x_of_table),
> >         },
> > -       .probe  = pcf857x_probe,
> > +       .probe_new = pcf857x_probe,
> >         .remove = pcf857x_remove,
> >         .shutdown = pcf857x_shutdown,
> >         .id_table = pcf857x_id,
> > --
> > 2.38.1
> >
>
> Applied, thanks!
>
> Bartosz

Same story as with the other ones:

Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
diff mbox series

Patch

diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index e98ea47d7237..cec2f2c78255 100644
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -247,9 +247,9 @@  static const struct irq_chip pcf857x_irq_chip = {
 
 /*-------------------------------------------------------------------------*/
 
-static int pcf857x_probe(struct i2c_client *client,
-			 const struct i2c_device_id *id)
+static int pcf857x_probe(struct i2c_client *client)
 {
+	const struct i2c_device_id *id = i2c_client_get_device_id(client);
 	struct pcf857x_platform_data	*pdata = dev_get_platdata(&client->dev);
 	struct device_node		*np = client->dev.of_node;
 	struct pcf857x			*gpio;
@@ -422,7 +422,7 @@  static struct i2c_driver pcf857x_driver = {
 		.name	= "pcf857x",
 		.of_match_table = of_match_ptr(pcf857x_of_table),
 	},
-	.probe	= pcf857x_probe,
+	.probe_new = pcf857x_probe,
 	.remove	= pcf857x_remove,
 	.shutdown = pcf857x_shutdown,
 	.id_table = pcf857x_id,