On Fri, Nov 18, 2022 at 11:41:29PM +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> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/i2c/mt9v032.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c > index bc4388ccc2a8..7cfd4ebdd2e6 100644 > --- a/drivers/media/i2c/mt9v032.c > +++ b/drivers/media/i2c/mt9v032.c > @@ -1044,9 +1044,9 @@ mt9v032_get_pdata(struct i2c_client *client) > return pdata; > } > > -static int mt9v032_probe(struct i2c_client *client, > - const struct i2c_device_id *did) > +static int mt9v032_probe(struct i2c_client *client) > { > + const struct i2c_device_id *did = i2c_client_get_device_id(client); > struct mt9v032_platform_data *pdata = mt9v032_get_pdata(client); > struct mt9v032 *mt9v032; > unsigned int i; > @@ -1296,7 +1296,7 @@ static struct i2c_driver mt9v032_driver = { > .name = "mt9v032", > .of_match_table = of_match_ptr(mt9v032_of_match), > }, > - .probe = mt9v032_probe, > + .probe_new = mt9v032_probe, > .remove = mt9v032_remove, > .id_table = mt9v032_id, > }; > -- > 2.38.1 >
diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c index bc4388ccc2a8..7cfd4ebdd2e6 100644 --- a/drivers/media/i2c/mt9v032.c +++ b/drivers/media/i2c/mt9v032.c @@ -1044,9 +1044,9 @@ mt9v032_get_pdata(struct i2c_client *client) return pdata; } -static int mt9v032_probe(struct i2c_client *client, - const struct i2c_device_id *did) +static int mt9v032_probe(struct i2c_client *client) { + const struct i2c_device_id *did = i2c_client_get_device_id(client); struct mt9v032_platform_data *pdata = mt9v032_get_pdata(client); struct mt9v032 *mt9v032; unsigned int i; @@ -1296,7 +1296,7 @@ static struct i2c_driver mt9v032_driver = { .name = "mt9v032", .of_match_table = of_match_ptr(mt9v032_of_match), }, - .probe = mt9v032_probe, + .probe_new = mt9v032_probe, .remove = mt9v032_remove, .id_table = mt9v032_id, };