| Message ID | 20221118224540.619276-584-uwe@kleine-koenig.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d24182b10cd5c734499c6185e9c63403ee1de5ac |
| Headers | show |
| Series | i2c: Complete conversion to i2c_probe_new | expand |
On Fri, Nov 18, 2022 at 11:45:17PM +0100, 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> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/typec/ucsi/ucsi_ccg.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c > index 835f1c4372ba..46441f1477f2 100644 > --- a/drivers/usb/typec/ucsi/ucsi_ccg.c > +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c > @@ -1338,8 +1338,7 @@ static struct attribute *ucsi_ccg_attrs[] = { > }; > ATTRIBUTE_GROUPS(ucsi_ccg); > > -static int ucsi_ccg_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int ucsi_ccg_probe(struct i2c_client *client) > { > struct device *dev = &client->dev; > struct ucsi_ccg *uc; > @@ -1482,7 +1481,7 @@ static struct i2c_driver ucsi_ccg_driver = { > .dev_groups = ucsi_ccg_groups, > .acpi_match_table = amd_i2c_ucsi_match, > }, > - .probe = ucsi_ccg_probe, > + .probe_new = ucsi_ccg_probe, > .remove = ucsi_ccg_remove, > .id_table = ucsi_ccg_device_id, > }; thanks,
diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c index 835f1c4372ba..46441f1477f2 100644 --- a/drivers/usb/typec/ucsi/ucsi_ccg.c +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c @@ -1338,8 +1338,7 @@ static struct attribute *ucsi_ccg_attrs[] = { }; ATTRIBUTE_GROUPS(ucsi_ccg); -static int ucsi_ccg_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ucsi_ccg_probe(struct i2c_client *client) { struct device *dev = &client->dev; struct ucsi_ccg *uc; @@ -1482,7 +1481,7 @@ static struct i2c_driver ucsi_ccg_driver = { .dev_groups = ucsi_ccg_groups, .acpi_match_table = amd_i2c_ucsi_match, }, - .probe = ucsi_ccg_probe, + .probe_new = ucsi_ccg_probe, .remove = ucsi_ccg_remove, .id_table = ucsi_ccg_device_id, };