| Message ID | 20221118224540.619276-596-uwe@kleine-koenig.org |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
Hello Evgeniy, On Fri, Nov 18, 2022 at 11:45:29PM +0100, Uwe Kleine-König wrote: > 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> > --- > drivers/w1/masters/ds2482.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/w1/masters/ds2482.c b/drivers/w1/masters/ds2482.c > index 62c44616d8a9..3d8b51316bef 100644 > --- a/drivers/w1/masters/ds2482.c > +++ b/drivers/w1/masters/ds2482.c > @@ -442,8 +442,7 @@ static u8 ds2482_w1_set_pullup(void *data, int delay) > } > > > -static int ds2482_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int ds2482_probe(struct i2c_client *client) > { > struct ds2482_data *data; > int err = -ENODEV; > @@ -553,7 +552,7 @@ static struct i2c_driver ds2482_driver = { > .driver = { > .name = "ds2482", > }, > - .probe = ds2482_probe, > + .probe_new = ds2482_probe, > .remove = ds2482_remove, > .id_table = ds2482_id, > }; Assuming you don't have any concerns, it would be great if you applied this patch for the next merge window. Best regards Uwe
Hello Evgeniy, On Fri, Dec 23, 2022 at 12:12:54AM +0100, Uwe Kleine-König wrote: > On Fri, Nov 18, 2022 at 11:45:29PM +0100, Uwe Kleine-König wrote: > > 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> > > --- > > drivers/w1/masters/ds2482.c | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/w1/masters/ds2482.c b/drivers/w1/masters/ds2482.c > > index 62c44616d8a9..3d8b51316bef 100644 > > --- a/drivers/w1/masters/ds2482.c > > +++ b/drivers/w1/masters/ds2482.c > > @@ -442,8 +442,7 @@ static u8 ds2482_w1_set_pullup(void *data, int delay) > > } > > > > > > -static int ds2482_probe(struct i2c_client *client, > > - const struct i2c_device_id *id) > > +static int ds2482_probe(struct i2c_client *client) > > { > > struct ds2482_data *data; > > int err = -ENODEV; > > @@ -553,7 +552,7 @@ static struct i2c_driver ds2482_driver = { > > .driver = { > > .name = "ds2482", > > }, > > - .probe = ds2482_probe, > > + .probe_new = ds2482_probe, > > .remove = ds2482_remove, > > .id_table = ds2482_id, > > }; > > Assuming you don't have any concerns, it would be great if you applied > this patch for the next merge window. I plan to create a patch series for Wolfram to apply shortly after the next merge window closed that changes the .probe() callback to match .probe_new(). So please either apply this patch during the next merge window (my preferred option), or accept (ideally with an Ack) that this patch will go via the i2c tree together with the patch changing .probe(). Best regards Uwe
diff --git a/drivers/w1/masters/ds2482.c b/drivers/w1/masters/ds2482.c index 62c44616d8a9..3d8b51316bef 100644 --- a/drivers/w1/masters/ds2482.c +++ b/drivers/w1/masters/ds2482.c @@ -442,8 +442,7 @@ static u8 ds2482_w1_set_pullup(void *data, int delay) } -static int ds2482_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ds2482_probe(struct i2c_client *client) { struct ds2482_data *data; int err = -ENODEV; @@ -553,7 +552,7 @@ static struct i2c_driver ds2482_driver = { .driver = { .name = "ds2482", }, - .probe = ds2482_probe, + .probe_new = ds2482_probe, .remove = ds2482_remove, .id_table = ds2482_id, };