| Message ID | 20221118224540.619276-561-uwe@kleine-koenig.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | i2c: Complete conversion to i2c_probe_new | expand |
Hello Alexandre, On Fri, Nov 18, 2022 at 11:44:54PM +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/rtc/rtc-ds1307.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c > index 7c2276cf5514..b49c02fd78f7 100644 > --- a/drivers/rtc/rtc-ds1307.c > +++ b/drivers/rtc/rtc-ds1307.c > @@ -1713,9 +1713,9 @@ static const struct regmap_config regmap_config = { > .val_bits = 8, > }; > > -static int ds1307_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int ds1307_probe(struct i2c_client *client) > { > + const struct i2c_device_id *id = i2c_client_get_device_id(client); > struct ds1307 *ds1307; > const void *match; > int err = -ENODEV; > @@ -2012,7 +2012,7 @@ static struct i2c_driver ds1307_driver = { > .name = "rtc-ds1307", > .of_match_table = ds1307_of_match, > }, > - .probe = ds1307_probe, > + .probe_new = ds1307_probe, > .id_table = ds1307_id, > }; This is the last remaining rtc patch in my i2c probe_new stack. Would you mind to apply it? Best regards Uwe
On Fri, 18 Nov 2022 23:44:54 +0100, Uwe Kleine-König wrote: > .probe_new() doesn't get the i2c_device_id * parameter, so determine > that explicitly in the probe function. > > Applied, thanks! [560/606] rtc: ds1307: Convert to i2c's .probe_new() commit: 4cd0ca1fe9a79d81a001ff14f14035531773fe43 Best regards,
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 7c2276cf5514..b49c02fd78f7 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -1713,9 +1713,9 @@ static const struct regmap_config regmap_config = { .val_bits = 8, }; -static int ds1307_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ds1307_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct ds1307 *ds1307; const void *match; int err = -ENODEV; @@ -2012,7 +2012,7 @@ static struct i2c_driver ds1307_driver = { .name = "rtc-ds1307", .of_match_table = ds1307_of_match, }, - .probe = ds1307_probe, + .probe_new = ds1307_probe, .id_table = ds1307_id, };