Hello Linus, On Fri, Nov 18, 2022 at 11:44:04PM +0100, Uwe Kleine-König 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/pinctrl/pinctrl-mcp23s08_i2c.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-mcp23s08_i2c.c b/drivers/pinctrl/pinctrl-mcp23s08_i2c.c > index e0b001c8c08c..b635c5737e0c 100644 > --- a/drivers/pinctrl/pinctrl-mcp23s08_i2c.c > +++ b/drivers/pinctrl/pinctrl-mcp23s08_i2c.c > @@ -8,8 +8,9 @@ > > #include "pinctrl-mcp23s08.h" > > -static int mcp230xx_probe(struct i2c_client *client, const struct i2c_device_id *id) > +static int mcp230xx_probe(struct i2c_client *client) > { > + const struct i2c_device_id *id = i2c_client_get_device_id(client); > struct device *dev = &client->dev; > unsigned int type = id->driver_data; > struct mcp23s08 *mcp; > @@ -100,7 +101,7 @@ static struct i2c_driver mcp230xx_driver = { > .name = "mcp230xx", > .of_match_table = mcp23s08_i2c_of_match, > }, > - .probe = mcp230xx_probe, > + .probe_new = mcp230xx_probe, > .id_table = mcp230xx_id, > }; To eventually get all drivers converted to probe_new it would be great if you picked this patch and #511 for pinctrl. Best regards Uwe
On Fri, Nov 18, 2022 at 11:48 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> Patch applied! Thanks for driving this big project. Yours, Linus Walleij
Hello Linus, On Tue, Jan 10, 2023 at 09:01:04AM +0100, Linus Walleij wrote: > On Fri, Nov 18, 2022 at 11:48 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> > > Patch applied! Thanks. Is there a reason you picked #510 but not #511 other than having missed there is a 2nd pinctrl patch in my series? If it's only that b4 am -P 511 -s -l CACRpkdaViC8T5qFRW+=+rGST=nr9beQJqTP7d42OoYUnhPhqig@mail.gmail.com is your friend. Best regards Uwe
On Wed, Jan 11, 2023 at 10:52 AM Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > Thanks. Is there a reason you picked #510 but not #511 other than having > missed there is a 2nd pinctrl patch in my series? > > If it's only that > > b4 am -P 511 -s -l CACRpkdaViC8T5qFRW+=+rGST=nr9beQJqTP7d42OoYUnhPhqig@mail.gmail.com > > is your friend. My bad. I applied 511 above as well, helpful with the oneliner! Yours, Linus Walleij
diff --git a/drivers/pinctrl/pinctrl-mcp23s08_i2c.c b/drivers/pinctrl/pinctrl-mcp23s08_i2c.c index e0b001c8c08c..b635c5737e0c 100644 --- a/drivers/pinctrl/pinctrl-mcp23s08_i2c.c +++ b/drivers/pinctrl/pinctrl-mcp23s08_i2c.c @@ -8,8 +8,9 @@ #include "pinctrl-mcp23s08.h" -static int mcp230xx_probe(struct i2c_client *client, const struct i2c_device_id *id) +static int mcp230xx_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct device *dev = &client->dev; unsigned int type = id->driver_data; struct mcp23s08 *mcp; @@ -100,7 +101,7 @@ static struct i2c_driver mcp230xx_driver = { .name = "mcp230xx", .of_match_table = mcp23s08_i2c_of_match, }, - .probe = mcp230xx_probe, + .probe_new = mcp230xx_probe, .id_table = mcp230xx_id, };