| Message ID | 20220531213922.72992-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1,1/2] iio: adc: nau7802: Convert driver to use ->probe_new() | expand |
On Wed, 1 Jun 2022 00:39:21 +0300 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > Use the ->probe_new() callback. > > The driver does not use const struct i2c_device_id * argument, > so convert it to utilise the simplified I²C driver registration. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Series applied, Thanks for all these cleanups btw. Jonathan > --- > drivers/iio/adc/nau7802.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/iio/adc/nau7802.c b/drivers/iio/adc/nau7802.c > index 976c235f3079..2d71cdbcd82f 100644 > --- a/drivers/iio/adc/nau7802.c > +++ b/drivers/iio/adc/nau7802.c > @@ -407,8 +407,7 @@ static const struct iio_info nau7802_info = { > .attrs = &nau7802_attribute_group, > }; > > -static int nau7802_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int nau7802_probe(struct i2c_client *client) > { > struct iio_dev *indio_dev; > struct nau7802_state *st; > @@ -417,11 +416,6 @@ static int nau7802_probe(struct i2c_client *client, > u8 data; > u32 tmp = 0; > > - if (!client->dev.of_node) { > - dev_err(&client->dev, "No device tree node available.\n"); > - return -EINVAL; > - } > - > indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*st)); > if (indio_dev == NULL) > return -ENOMEM; > @@ -550,7 +544,7 @@ static const struct of_device_id nau7802_dt_ids[] = { > MODULE_DEVICE_TABLE(of, nau7802_dt_ids); > > static struct i2c_driver nau7802_driver = { > - .probe = nau7802_probe, > + .probe_new = nau7802_probe, > .id_table = nau7802_i2c_id, > .driver = { > .name = "nau7802",
diff --git a/drivers/iio/adc/nau7802.c b/drivers/iio/adc/nau7802.c index 976c235f3079..2d71cdbcd82f 100644 --- a/drivers/iio/adc/nau7802.c +++ b/drivers/iio/adc/nau7802.c @@ -407,8 +407,7 @@ static const struct iio_info nau7802_info = { .attrs = &nau7802_attribute_group, }; -static int nau7802_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int nau7802_probe(struct i2c_client *client) { struct iio_dev *indio_dev; struct nau7802_state *st; @@ -417,11 +416,6 @@ static int nau7802_probe(struct i2c_client *client, u8 data; u32 tmp = 0; - if (!client->dev.of_node) { - dev_err(&client->dev, "No device tree node available.\n"); - return -EINVAL; - } - indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*st)); if (indio_dev == NULL) return -ENOMEM; @@ -550,7 +544,7 @@ static const struct of_device_id nau7802_dt_ids[] = { MODULE_DEVICE_TABLE(of, nau7802_dt_ids); static struct i2c_driver nau7802_driver = { - .probe = nau7802_probe, + .probe_new = nau7802_probe, .id_table = nau7802_i2c_id, .driver = { .name = "nau7802",
Use the ->probe_new() callback. The driver does not use const struct i2c_device_id * argument, so convert it to utilise the simplified I²C driver registration. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/iio/adc/nau7802.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)