| Message ID | 20221118224540.619276-604-uwe@kleine-koenig.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 830a35aa2121258d0c8283abe45ebb5c3d2fd791 |
| Headers | show |
| Series | i2c: Complete conversion to i2c_probe_new | expand |
Reviewed-by: Matt Flax <flatmax@flatmax.com> On 19/11/22 09:45, 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> > --- > sound/soc/codecs/src4xxx-i2c.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/codecs/src4xxx-i2c.c b/sound/soc/codecs/src4xxx-i2c.c > index 43daa9dc8ab5..27026030704a 100644 > --- a/sound/soc/codecs/src4xxx-i2c.c > +++ b/sound/soc/codecs/src4xxx-i2c.c > @@ -12,8 +12,7 @@ > > #include "src4xxx.h" > > -static int src4xxx_i2c_probe(struct i2c_client *i2c, > - const struct i2c_device_id *id) > +static int src4xxx_i2c_probe(struct i2c_client *i2c) > { > return src4xxx_probe(&i2c->dev, > devm_regmap_init_i2c(i2c, &src4xxx_regmap_config), NULL); > @@ -37,7 +36,7 @@ static struct i2c_driver src4xxx_i2c_driver = { > .name = "src4xxx", > .of_match_table = of_match_ptr(src4xxx_of_match), > }, > - .probe = src4xxx_i2c_probe, > + .probe_new = src4xxx_i2c_probe, > .id_table = src4xxx_i2c_ids, > }; > module_i2c_driver(src4xxx_i2c_driver);
diff --git a/sound/soc/codecs/src4xxx-i2c.c b/sound/soc/codecs/src4xxx-i2c.c index 43daa9dc8ab5..27026030704a 100644 --- a/sound/soc/codecs/src4xxx-i2c.c +++ b/sound/soc/codecs/src4xxx-i2c.c @@ -12,8 +12,7 @@ #include "src4xxx.h" -static int src4xxx_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int src4xxx_i2c_probe(struct i2c_client *i2c) { return src4xxx_probe(&i2c->dev, devm_regmap_init_i2c(i2c, &src4xxx_regmap_config), NULL); @@ -37,7 +36,7 @@ static struct i2c_driver src4xxx_i2c_driver = { .name = "src4xxx", .of_match_table = of_match_ptr(src4xxx_of_match), }, - .probe = src4xxx_i2c_probe, + .probe_new = src4xxx_i2c_probe, .id_table = src4xxx_i2c_ids, }; module_i2c_driver(src4xxx_i2c_driver);