On Fri, Nov 18, 2022 at 11:36:21PM +0100, Uwe Kleine-König wrote: > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > The probe function doesn't make use of the i2c_device_id * parameter so it > can be trivially converted. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/i2c/muxes/i2c-mux-pca9541.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c > index ea83de78f52d..09d1d9e67e31 100644 > --- a/drivers/i2c/muxes/i2c-mux-pca9541.c > +++ b/drivers/i2c/muxes/i2c-mux-pca9541.c > @@ -283,8 +283,7 @@ static int pca9541_release_chan(struct i2c_mux_core *muxc, u32 chan) > /* > * I2C init/probing/exit functions > */ > -static int pca9541_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int pca9541_probe(struct i2c_client *client) > { > struct i2c_adapter *adap = client->adapter; > struct i2c_mux_core *muxc; > @@ -337,7 +336,7 @@ static struct i2c_driver pca9541_driver = { > .name = "pca9541", > .of_match_table = of_match_ptr(pca9541_of_match), > }, > - .probe = pca9541_probe, > + .probe_new = pca9541_probe, > .remove = pca9541_remove, > .id_table = pca9541_id, > }; > -- > 2.38.1 >
2022-11-18 at 23:36, Uwe Kleine-König wrote: > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > The probe function doesn't make use of the i2c_device_id * parameter so it > can be trivially converted. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Peter Rosin <peda@axentia.se> > --- > drivers/i2c/muxes/i2c-mux-pca9541.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c > index ea83de78f52d..09d1d9e67e31 100644 > --- a/drivers/i2c/muxes/i2c-mux-pca9541.c > +++ b/drivers/i2c/muxes/i2c-mux-pca9541.c > @@ -283,8 +283,7 @@ static int pca9541_release_chan(struct i2c_mux_core *muxc, u32 chan) > /* > * I2C init/probing/exit functions > */ > -static int pca9541_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int pca9541_probe(struct i2c_client *client) > { > struct i2c_adapter *adap = client->adapter; > struct i2c_mux_core *muxc; > @@ -337,7 +336,7 @@ static struct i2c_driver pca9541_driver = { > .name = "pca9541", > .of_match_table = of_match_ptr(pca9541_of_match), > }, > - .probe = pca9541_probe, > + .probe_new = pca9541_probe, > .remove = pca9541_remove, > .id_table = pca9541_id, > };
On Fri, Nov 18, 2022 at 11:36:21PM +0100, Uwe Kleine-König wrote: > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > The probe function doesn't make use of the i2c_device_id * parameter so it > can be trivially converted. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Found an older patch doing the same, but still thanks!
On Mon, Dec 05, 2022 at 10:46:16AM +0100, Wolfram Sang wrote: > On Fri, Nov 18, 2022 at 11:36:21PM +0100, Uwe Kleine-König wrote: > > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > > > The probe function doesn't make use of the i2c_device_id * parameter so it > > can be trivially converted. > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > Found an older patch doing the same, but still thanks! Yeah, sorry for the duplicates. I started on mainline instead of next + my patchstack when creating this series. Thanks for picking these up Uwe
diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c index ea83de78f52d..09d1d9e67e31 100644 --- a/drivers/i2c/muxes/i2c-mux-pca9541.c +++ b/drivers/i2c/muxes/i2c-mux-pca9541.c @@ -283,8 +283,7 @@ static int pca9541_release_chan(struct i2c_mux_core *muxc, u32 chan) /* * I2C init/probing/exit functions */ -static int pca9541_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int pca9541_probe(struct i2c_client *client) { struct i2c_adapter *adap = client->adapter; struct i2c_mux_core *muxc; @@ -337,7 +336,7 @@ static struct i2c_driver pca9541_driver = { .name = "pca9541", .of_match_table = of_match_ptr(pca9541_of_match), }, - .probe = pca9541_probe, + .probe_new = pca9541_probe, .remove = pca9541_remove, .id_table = pca9541_id, };