| Message ID | 20221118224540.619276-55-uwe@kleine-koenig.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | i2c: Complete conversion to i2c_probe_new | expand |
On Fri, Nov 18, 2022 at 11:36:28PM +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. Since there is no split on per subsystem basis (I mean, as a series targeting only, let's say, IIO subsystem with cover letter), I'm answering here that all IIO patches are good to me, thanks, Uwe! Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/iio/accel/kxcjk-1013.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c > index e626b6fa8a36..98da4bda22df 100644 > --- a/drivers/iio/accel/kxcjk-1013.c > +++ b/drivers/iio/accel/kxcjk-1013.c > @@ -1424,9 +1424,9 @@ static const char *kxcjk1013_match_acpi_device(struct device *dev, > return dev_name(dev); > } > > -static int kxcjk1013_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int kxcjk1013_probe(struct i2c_client *client) > { > + const struct i2c_device_id *id = i2c_client_get_device_id(client); > static const char * const regulator_names[] = { "vdd", "vddio" }; > struct kxcjk1013_data *data; > struct iio_dev *indio_dev; > @@ -1732,7 +1732,7 @@ static struct i2c_driver kxcjk1013_driver = { > .of_match_table = kxcjk1013_of_match, > .pm = &kxcjk1013_pm_ops, > }, > - .probe = kxcjk1013_probe, > + .probe_new = kxcjk1013_probe, > .remove = kxcjk1013_remove, > .id_table = kxcjk1013_id, > }; > -- > 2.38.1 >
Hello Andy, On Sat, Nov 19, 2022 at 02:03:42PM +0200, Andy Shevchenko wrote: > On Fri, Nov 18, 2022 at 11:36:28PM +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. > > Since there is no split on per subsystem basis (I mean, as a series targeting > only, let's say, IIO subsystem with cover letter), I'm answering here that all > IIO patches are good to me, thanks, Uwe! > > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Thanks! Does this include the three patches: staging: iio: adt7316: Convert to i2c's .probe_new() staging: iio: ad5933: Convert to i2c's .probe_new() staging: iio: ade7854: Convert to i2c's .probe_new() ? Best regards Uwe
On Sat, Nov 19, 2022 at 05:08:18PM +0100, Uwe Kleine-König wrote: > On Sat, Nov 19, 2022 at 02:03:42PM +0200, Andy Shevchenko wrote: > > On Fri, Nov 18, 2022 at 11:36:28PM +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. > > > > Since there is no split on per subsystem basis (I mean, as a series targeting > > only, let's say, IIO subsystem with cover letter), I'm answering here that all > > IIO patches are good to me, thanks, Uwe! > > > > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > Thanks! > > Does this include the three patches: > > staging: iio: adt7316: Convert to i2c's .probe_new() > staging: iio: ad5933: Convert to i2c's .probe_new() > staging: iio: ade7854: Convert to i2c's .probe_new() > > ? It includes IIO patches, for staging I didn't looked at.
diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c index e626b6fa8a36..98da4bda22df 100644 --- a/drivers/iio/accel/kxcjk-1013.c +++ b/drivers/iio/accel/kxcjk-1013.c @@ -1424,9 +1424,9 @@ static const char *kxcjk1013_match_acpi_device(struct device *dev, return dev_name(dev); } -static int kxcjk1013_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int kxcjk1013_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_client_get_device_id(client); static const char * const regulator_names[] = { "vdd", "vddio" }; struct kxcjk1013_data *data; struct iio_dev *indio_dev; @@ -1732,7 +1732,7 @@ static struct i2c_driver kxcjk1013_driver = { .of_match_table = kxcjk1013_of_match, .pm = &kxcjk1013_pm_ops, }, - .probe = kxcjk1013_probe, + .probe_new = kxcjk1013_probe, .remove = kxcjk1013_remove, .id_table = kxcjk1013_id, };