| Message ID | 20230224120600.1681685-9-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | i2c: Switch .probe() to not take an id parameter | expand |
On 2/24/23 04:05, Uwe Kleine-König wrote: > Now that .probe() was changed not to get the id parameter, drivers can > be converted back to that with the eventual goal to drop .probe_new(). > > Implement that for the i2c mux drivers. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/i2c/muxes/i2c-mux-ltc4306.c | 2 +- > drivers/i2c/muxes/i2c-mux-pca9541.c | 2 +- > drivers/i2c/muxes/i2c-mux-pca954x.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/i2c/muxes/i2c-mux-ltc4306.c b/drivers/i2c/muxes/i2c-mux-ltc4306.c > index 70835825083f..5a03031519be 100644 > --- a/drivers/i2c/muxes/i2c-mux-ltc4306.c > +++ b/drivers/i2c/muxes/i2c-mux-ltc4306.c > @@ -306,7 +306,7 @@ static struct i2c_driver ltc4306_driver = { > .name = "ltc4306", > .of_match_table = of_match_ptr(ltc4306_of_match), > }, > - .probe_new = ltc4306_probe, > + .probe = ltc4306_probe, > .remove = ltc4306_remove, > .id_table = ltc4306_id, > }; > diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c > index 09d1d9e67e31..ce0fb69249a8 100644 > --- a/drivers/i2c/muxes/i2c-mux-pca9541.c > +++ b/drivers/i2c/muxes/i2c-mux-pca9541.c > @@ -336,7 +336,7 @@ static struct i2c_driver pca9541_driver = { > .name = "pca9541", > .of_match_table = of_match_ptr(pca9541_of_match), > }, > - .probe_new = pca9541_probe, > + .probe = pca9541_probe, > .remove = pca9541_remove, > .id_table = pca9541_id, > }; > diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c > index 3639e6d7304c..0ccee2ae5720 100644 > --- a/drivers/i2c/muxes/i2c-mux-pca954x.c > +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c > @@ -554,7 +554,7 @@ static struct i2c_driver pca954x_driver = { > .pm = &pca954x_pm, > .of_match_table = pca954x_of_match, > }, > - .probe_new = pca954x_probe, > + .probe = pca954x_probe, > .remove = pca954x_remove, > .id_table = pca954x_id, > };
Hi! 2023-02-24 at 13:05, Uwe Kleine-König wrote: > Now that .probe() was changed not to get the id parameter, drivers can > be converted back to that with the eventual goal to drop .probe_new(). > > Implement that for the i2c mux drivers. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> *snip* Acked-by: Peter Rosin <peda@axentia.se> Cheers, Peter
diff --git a/drivers/i2c/muxes/i2c-mux-ltc4306.c b/drivers/i2c/muxes/i2c-mux-ltc4306.c index 70835825083f..5a03031519be 100644 --- a/drivers/i2c/muxes/i2c-mux-ltc4306.c +++ b/drivers/i2c/muxes/i2c-mux-ltc4306.c @@ -306,7 +306,7 @@ static struct i2c_driver ltc4306_driver = { .name = "ltc4306", .of_match_table = of_match_ptr(ltc4306_of_match), }, - .probe_new = ltc4306_probe, + .probe = ltc4306_probe, .remove = ltc4306_remove, .id_table = ltc4306_id, }; diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c index 09d1d9e67e31..ce0fb69249a8 100644 --- a/drivers/i2c/muxes/i2c-mux-pca9541.c +++ b/drivers/i2c/muxes/i2c-mux-pca9541.c @@ -336,7 +336,7 @@ static struct i2c_driver pca9541_driver = { .name = "pca9541", .of_match_table = of_match_ptr(pca9541_of_match), }, - .probe_new = pca9541_probe, + .probe = pca9541_probe, .remove = pca9541_remove, .id_table = pca9541_id, }; diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 3639e6d7304c..0ccee2ae5720 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -554,7 +554,7 @@ static struct i2c_driver pca954x_driver = { .pm = &pca954x_pm, .of_match_table = pca954x_of_match, }, - .probe_new = pca954x_probe, + .probe = pca954x_probe, .remove = pca954x_remove, .id_table = pca954x_id, };
Now that .probe() was changed not to get the id parameter, drivers can be converted back to that with the eventual goal to drop .probe_new(). Implement that for the i2c mux drivers. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/i2c/muxes/i2c-mux-ltc4306.c | 2 +- drivers/i2c/muxes/i2c-mux-pca9541.c | 2 +- drivers/i2c/muxes/i2c-mux-pca954x.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)