Hi, On 11/18/22 23:36, 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> Thanks, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > drivers/iio/accel/mma8452.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c > index 3ba28c2ff68a..f97fb68e3a71 100644 > --- a/drivers/iio/accel/mma8452.c > +++ b/drivers/iio/accel/mma8452.c > @@ -1545,9 +1545,9 @@ static const struct of_device_id mma8452_dt_ids[] = { > }; > MODULE_DEVICE_TABLE(of, mma8452_dt_ids); > > -static int mma8452_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int mma8452_probe(struct i2c_client *client) > { > + const struct i2c_device_id *id = i2c_client_get_device_id(client); > struct mma8452_data *data; > struct iio_dev *indio_dev; > int ret; > @@ -1846,7 +1846,7 @@ static struct i2c_driver mma8452_driver = { > .of_match_table = mma8452_dt_ids, > .pm = &mma8452_pm_ops, > }, > - .probe = mma8452_probe, > + .probe_new = mma8452_probe, > .remove = mma8452_remove, > .id_table = mma8452_id, > };
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index 3ba28c2ff68a..f97fb68e3a71 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -1545,9 +1545,9 @@ static const struct of_device_id mma8452_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, mma8452_dt_ids); -static int mma8452_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int mma8452_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); struct mma8452_data *data; struct iio_dev *indio_dev; int ret; @@ -1846,7 +1846,7 @@ static struct i2c_driver mma8452_driver = { .of_match_table = mma8452_dt_ids, .pm = &mma8452_pm_ops, }, - .probe = mma8452_probe, + .probe_new = mma8452_probe, .remove = mma8452_remove, .id_table = mma8452_id, };