Commit Message
Uwe Kleine-König
Nov. 18, 2022, 10:41 p.m. UTC
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/media/i2c/mt9p031.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Comments
On Fri, Nov 18, 2022 at 11:41:25PM +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/mt9p031.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c > index 45f7b5e52bc3..ecee8a58d930 100644 > --- a/drivers/media/i2c/mt9p031.c > +++ b/drivers/media/i2c/mt9p031.c > @@ -1097,9 +1097,9 @@ mt9p031_get_pdata(struct i2c_client *client) > return pdata; > } > > -static int mt9p031_probe(struct i2c_client *client, > - const struct i2c_device_id *did) > +static int mt9p031_probe(struct i2c_client *client) > { > + const struct i2c_device_id *did = i2c_client_get_device_id(client); > struct mt9p031_platform_data *pdata = mt9p031_get_pdata(client); > struct i2c_adapter *adapter = client->adapter; > struct mt9p031 *mt9p031; > @@ -1243,7 +1243,7 @@ static struct i2c_driver mt9p031_i2c_driver = { > .of_match_table = of_match_ptr(mt9p031_of_match), > .name = "mt9p031", > }, > - .probe = mt9p031_probe, > + .probe_new = mt9p031_probe, > .remove = mt9p031_remove, > .id_table = mt9p031_id, > }; > -- > 2.38.1 >
diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c index 45f7b5e52bc3..ecee8a58d930 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -1097,9 +1097,9 @@ mt9p031_get_pdata(struct i2c_client *client) return pdata; } -static int mt9p031_probe(struct i2c_client *client, - const struct i2c_device_id *did) +static int mt9p031_probe(struct i2c_client *client) { + const struct i2c_device_id *did = i2c_client_get_device_id(client); struct mt9p031_platform_data *pdata = mt9p031_get_pdata(client); struct i2c_adapter *adapter = client->adapter; struct mt9p031 *mt9p031; @@ -1243,7 +1243,7 @@ static struct i2c_driver mt9p031_i2c_driver = { .of_match_table = of_match_ptr(mt9p031_of_match), .name = "mt9p031", }, - .probe = mt9p031_probe, + .probe_new = mt9p031_probe, .remove = mt9p031_remove, .id_table = mt9p031_id, };