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-max732x.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c > index da6972117030..68e982cdee73 100644 > --- a/drivers/gpio/gpio-max732x.c > +++ b/drivers/gpio/gpio-max732x.c > @@ -608,9 +608,9 @@ static struct max732x_platform_data *of_gpio_max732x(struct device *dev) > return pdata; > } > > -static int max732x_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int max732x_probe(struct i2c_client *client) > { > + const struct i2c_device_id *id = i2c_client_get_device_id(client); > struct max732x_platform_data *pdata; > struct device_node *node; > struct max732x_chip *chip; > @@ -707,7 +707,7 @@ static struct i2c_driver max732x_driver = { > .name = "max732x", > .of_match_table = of_match_ptr(max732x_of_table), > }, > - .probe = max732x_probe, > + .probe_new = max732x_probe, > .id_table = max732x_id, > }; > > -- > 2.38.1 > Applied, thanks! Bartosz
On Wed, Nov 23, 2022 at 10:47 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-max732x.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c > > index da6972117030..68e982cdee73 100644 > > --- a/drivers/gpio/gpio-max732x.c > > +++ b/drivers/gpio/gpio-max732x.c > > @@ -608,9 +608,9 @@ static struct max732x_platform_data *of_gpio_max732x(struct device *dev) > > return pdata; > > } > > > > -static int max732x_probe(struct i2c_client *client, > > - const struct i2c_device_id *id) > > +static int max732x_probe(struct i2c_client *client) > > { > > + const struct i2c_device_id *id = i2c_client_get_device_id(client); > > struct max732x_platform_data *pdata; > > struct device_node *node; > > struct max732x_chip *chip; > > @@ -707,7 +707,7 @@ static struct i2c_driver max732x_driver = { > > .name = "max732x", > > .of_match_table = of_match_ptr(max732x_of_table), > > }, > > - .probe = max732x_probe, > > + .probe_new = max732x_probe, > > .id_table = max732x_id, > > }; > > > > -- > > 2.38.1 > > > > Applied, thanks! > > Bartosz Ugh, backing it out, I thought these patches were independent. In that case: Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
On Wed, Nov 23, 2022 at 04:49:05PM +0100, Bartosz Golaszewski wrote: > On Wed, Nov 23, 2022 at 10:47 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-max732x.c | 6 +++--- > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c > > > index da6972117030..68e982cdee73 100644 > > > --- a/drivers/gpio/gpio-max732x.c > > > +++ b/drivers/gpio/gpio-max732x.c > > > @@ -608,9 +608,9 @@ static struct max732x_platform_data *of_gpio_max732x(struct device *dev) > > > return pdata; > > > } > > > > > > -static int max732x_probe(struct i2c_client *client, > > > - const struct i2c_device_id *id) > > > +static int max732x_probe(struct i2c_client *client) > > > { > > > + const struct i2c_device_id *id = i2c_client_get_device_id(client); > > > struct max732x_platform_data *pdata; > > > struct device_node *node; > > > struct max732x_chip *chip; > > > @@ -707,7 +707,7 @@ static struct i2c_driver max732x_driver = { > > > .name = "max732x", > > > .of_match_table = of_match_ptr(max732x_of_table), > > > }, > > > - .probe = max732x_probe, > > > + .probe_new = max732x_probe, > > > .id_table = max732x_id, > > > }; > > > > > > -- > > > 2.38.1 > > > > > > > Applied, thanks! > > > > Bartosz > > Ugh, backing it out, I thought these patches were independent. They depend on i2c_client_get_device_id which you can get into your tree either by pulling in https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/client_device_id_helper-immutable or by waiting until this hits Linus Torvald's tree and updating to that. I'd like to see the gpio patches go in via the gpio tree. If you choose not to pull in the above and apply now, I will resend (per subsystem) the remaining patches based on the next -rc1 containing that function. Best regards Uwe
On Wed, Nov 23, 2022 at 5:41 PM Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > On Wed, Nov 23, 2022 at 04:49:05PM +0100, Bartosz Golaszewski wrote: > > On Wed, Nov 23, 2022 at 10:47 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-max732x.c | 6 +++--- > > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > > > diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c > > > > index da6972117030..68e982cdee73 100644 > > > > --- a/drivers/gpio/gpio-max732x.c > > > > +++ b/drivers/gpio/gpio-max732x.c > > > > @@ -608,9 +608,9 @@ static struct max732x_platform_data *of_gpio_max732x(struct device *dev) > > > > return pdata; > > > > } > > > > > > > > -static int max732x_probe(struct i2c_client *client, > > > > - const struct i2c_device_id *id) > > > > +static int max732x_probe(struct i2c_client *client) > > > > { > > > > + const struct i2c_device_id *id = i2c_client_get_device_id(client); > > > > struct max732x_platform_data *pdata; > > > > struct device_node *node; > > > > struct max732x_chip *chip; > > > > @@ -707,7 +707,7 @@ static struct i2c_driver max732x_driver = { > > > > .name = "max732x", > > > > .of_match_table = of_match_ptr(max732x_of_table), > > > > }, > > > > - .probe = max732x_probe, > > > > + .probe_new = max732x_probe, > > > > .id_table = max732x_id, > > > > }; > > > > > > > > -- > > > > 2.38.1 > > > > > > > > > > Applied, thanks! > > > > > > Bartosz > > > > Ugh, backing it out, I thought these patches were independent. > > They depend on i2c_client_get_device_id which you can get into your tree > either by pulling in > > https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/client_device_id_helper-immutable > > or by waiting until this hits Linus Torvald's tree and updating to that. > > I'd like to see the gpio patches go in via the gpio tree. If you choose > not to pull in the above and apply now, I will resend (per subsystem) > the remaining patches based on the next -rc1 containing that function. > That's alright, I pulled Wolfram's branch and re-applied the three patches. Bart
diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c index da6972117030..68e982cdee73 100644 --- a/drivers/gpio/gpio-max732x.c +++ b/drivers/gpio/gpio-max732x.c @@ -608,9 +608,9 @@ static struct max732x_platform_data *of_gpio_max732x(struct device *dev) return pdata; } -static int max732x_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int max732x_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct max732x_platform_data *pdata; struct device_node *node; struct max732x_chip *chip; @@ -707,7 +707,7 @@ static struct i2c_driver max732x_driver = { .name = "max732x", .of_match_table = of_match_ptr(max732x_of_table), }, - .probe = max732x_probe, + .probe_new = max732x_probe, .id_table = max732x_id, };