| Message ID | 20221118224540.619276-15-uwe@kleine-koenig.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 1c546894ff82 |
| Headers | show |
| Series | None | expand |
On Fri, Nov 18, 2022 at 11:35:48PM +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+renesas@ideasonboard.com> > --- > drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > index e7a6e456ed0d..ddceafa7b637 100644 > --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > @@ -1185,8 +1185,9 @@ static int adv7511_parse_dt(struct device_node *np, > return 0; > } > > -static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) > +static int adv7511_probe(struct i2c_client *i2c) > { > + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); > struct adv7511_link_config link_config; > struct adv7511 *adv7511; > struct device *dev = &i2c->dev; > @@ -1392,7 +1393,7 @@ static struct i2c_driver adv7511_driver = { > .of_match_table = adv7511_of_ids, > }, > .id_table = adv7511_i2c_ids, > - .probe = adv7511_probe, > + .probe_new = adv7511_probe, > .remove = adv7511_remove, > }; > > -- > 2.38.1 >
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index e7a6e456ed0d..ddceafa7b637 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -1185,8 +1185,9 @@ static int adv7511_parse_dt(struct device_node *np, return 0; } -static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) +static int adv7511_probe(struct i2c_client *i2c) { + const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct adv7511_link_config link_config; struct adv7511 *adv7511; struct device *dev = &i2c->dev; @@ -1392,7 +1393,7 @@ static struct i2c_driver adv7511_driver = { .of_match_table = adv7511_of_ids, }, .id_table = adv7511_i2c_ids, - .probe = adv7511_probe, + .probe_new = adv7511_probe, .remove = adv7511_remove, };