> -----Original Message----- > From: Uwe Kleine-König <uwe@xxxxxxxxxxxxxxxxx> > Sent: Freitag, 18. November 2022 23:43 > To: Angel Iglesias <ang.iglesiasg@xxxxxxxxx>; Lee Jones > <lee.jones@xxxxxxxxxx>; Grant Likely <grant.likely@xxxxxxxxxx>; Wolfram > Sang <wsa@xxxxxxxxxx>; Hennerich, Michael > <Michael.Hennerich@xxxxxxxxxx>; Lee Jones <lee@xxxxxxxxxx> > Cc: linux-i2c@xxxxxxxxxxxxxxx; kernel@xxxxxxxxxxxxxx; Uwe Kleine-König > <u.kleine-koenig@xxxxxxxxxxxxxx>; linux-kernel@xxxxxxxxxxxxxxx > Subject: [PATCH 417/606] mfd: adp5520: Convert to i2c's .probe_new() > > > From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > > .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@xxxxxxxxxxxxxx> Acked-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx> > --- > drivers/mfd/adp5520.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c index > 882eddc32f8e..cb168efdbafe 100644 > --- a/drivers/mfd/adp5520.c > +++ b/drivers/mfd/adp5520.c > @@ -204,9 +204,9 @@ static int adp5520_remove_subdevs(struct > adp5520_chip *chip) > return device_for_each_child(chip->dev, NULL, __remove_subdev); } > > -static int adp5520_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int adp5520_probe(struct i2c_client *client) > { > + const struct i2c_device_id *id = i2c_client_get_device_id(client); > struct adp5520_platform_data *pdata = dev_get_platdata(&client- > >dev); > struct platform_device *pdev; > struct adp5520_chip *chip; > @@ -340,7 +340,7 @@ static struct i2c_driver adp5520_driver = { > .pm = pm_sleep_ptr(&adp5520_pm), > .suppress_bind_attrs = true, > }, > - .probe = adp5520_probe, > + .probe_new = adp5520_probe, > .id_table = adp5520_id, > }; > builtin_i2c_driver(adp5520_driver); > -- > 2.38.1