| Message ID | 20221118224540.619276-595-uwe@kleine-koenig.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 3074742317e3b95dcd1faf248ad2b5c2d9d7a558 |
| Headers | show |
| Series | None | expand |
On 11/18/22 23:45, Uwe Kleine-König wrote: > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > The probe function doesn't make use of the i2c_device_id * parameter so it > can be trivially converted. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> applied. Thanks! Helge > --- > drivers/video/fbdev/matrox/matroxfb_maven.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/video/fbdev/matrox/matroxfb_maven.c b/drivers/video/fbdev/matrox/matroxfb_maven.c > index f2e02958673d..727a10a59811 100644 > --- a/drivers/video/fbdev/matrox/matroxfb_maven.c > +++ b/drivers/video/fbdev/matrox/matroxfb_maven.c > @@ -1249,8 +1249,7 @@ static int maven_shutdown_client(struct i2c_client* clnt) { > return 0; > } > > -static int maven_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int maven_probe(struct i2c_client *client) > { > struct i2c_adapter *adapter = client->adapter; > int err = -ENODEV; > @@ -1292,7 +1291,7 @@ static struct i2c_driver maven_driver={ > .driver = { > .name = "maven", > }, > - .probe = maven_probe, > + .probe_new = maven_probe, > .remove = maven_remove, > .id_table = maven_id, > };
diff --git a/drivers/video/fbdev/matrox/matroxfb_maven.c b/drivers/video/fbdev/matrox/matroxfb_maven.c index f2e02958673d..727a10a59811 100644 --- a/drivers/video/fbdev/matrox/matroxfb_maven.c +++ b/drivers/video/fbdev/matrox/matroxfb_maven.c @@ -1249,8 +1249,7 @@ static int maven_shutdown_client(struct i2c_client* clnt) { return 0; } -static int maven_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int maven_probe(struct i2c_client *client) { struct i2c_adapter *adapter = client->adapter; int err = -ENODEV; @@ -1292,7 +1291,7 @@ static struct i2c_driver maven_driver={ .driver = { .name = "maven", }, - .probe = maven_probe, + .probe_new = maven_probe, .remove = maven_remove, .id_table = maven_id, };