On Mon, 3 Aug 2020 17:58:05 -0600 Daniel Campello <[email protected]> wrote:
> Uses .probe_new in place of .probe. Also uses device_get_match_data() > for whoami matching. > > Signed-off-by: Daniel Campello <[email protected]> > Reviewed-by: Andy Shevchenko <[email protected]> > Reviewed-by: Stephen Boyd <[email protected]> Applied, Thanks, Jonathan > --- > > Changes in v5: None > Changes in v4: None > Changes in v3: None > Changes in v2: > - Added '\n' to dev_err() > > drivers/iio/proximity/sx9310.c | 39 ++++++++++++---------------------- > 1 file changed, 14 insertions(+), 25 deletions(-) > > diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c > index 9daf2b8591a0a0..66ecdd309e0ddc 100644 > --- a/drivers/iio/proximity/sx9310.c > +++ b/drivers/iio/proximity/sx9310.c > @@ -139,7 +139,7 @@ struct sx9310_data { > struct completion completion; > unsigned int chan_read, chan_event; > int channel_users[SX9310_NUM_CHANNELS]; > - int whoami; > + unsigned int whoami; > }; > > static const struct iio_event_spec sx9310_events[] = { > @@ -858,24 +858,15 @@ static int sx9310_init_device(struct iio_dev *indio_dev) > > static int sx9310_set_indio_dev_name(struct device *dev, > struct iio_dev *indio_dev, > - const struct i2c_device_id *id, int whoami) > + unsigned int whoami) > { > - const struct acpi_device_id *acpi_id; > - > - /* id will be NULL when enumerated via ACPI */ > - if (id) { > - if (id->driver_data != whoami) > - dev_err(dev, "WHOAMI does not match i2c_device_id: %s", > - id->name); > - } else if (ACPI_HANDLE(dev)) { > - acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev); > - if (!acpi_id) > - return -ENODEV; > - if (acpi_id->driver_data != whoami) > - dev_err(dev, "WHOAMI does not match acpi_device_id: %s", > - acpi_id->id); > - } else > + unsigned int long ddata; > + > + ddata = (uintptr_t)device_get_match_data(dev); > + if (ddata != whoami) { > + dev_err(dev, "WHOAMI does not match device data: %u\n", whoami); > return -ENODEV; > + } > > switch (whoami) { > case SX9310_WHOAMI_VALUE: > @@ -885,15 +876,14 @@ static int sx9310_set_indio_dev_name(struct device *dev, > indio_dev->name = "sx9311"; > break; > default: > - dev_err(dev, "unexpected WHOAMI response: %u", whoami); > + dev_err(dev, "unexpected WHOAMI response: %u\n", whoami); > return -ENODEV; > } > > return 0; > } > > -static int sx9310_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int sx9310_probe(struct i2c_client *client) > { > int ret; > struct iio_dev *indio_dev; > @@ -919,8 +909,7 @@ static int sx9310_probe(struct i2c_client *client, > return ret; > } > > - ret = sx9310_set_indio_dev_name(&client->dev, indio_dev, id, > - data->whoami); > + ret = sx9310_set_indio_dev_name(&client->dev, indio_dev, data->whoami); > if (ret < 0) > return ret; > > @@ -1033,8 +1022,8 @@ static const struct acpi_device_id sx9310_acpi_match[] > = { > MODULE_DEVICE_TABLE(acpi, sx9310_acpi_match); > > static const struct of_device_id sx9310_of_match[] = { > - { .compatible = "semtech,sx9310" }, > - { .compatible = "semtech,sx9311" }, > + { .compatible = "semtech,sx9310", (void *)SX9310_WHOAMI_VALUE }, > + { .compatible = "semtech,sx9311", (void *)SX9311_WHOAMI_VALUE }, > {}, > }; > MODULE_DEVICE_TABLE(of, sx9310_of_match); > @@ -1053,7 +1042,7 @@ static struct i2c_driver sx9310_driver = { > .of_match_table = sx9310_of_match, > .pm = &sx9310_pm_ops, > }, > - .probe = sx9310_probe, > + .probe_new = sx9310_probe, > .id_table = sx9310_id, > }; > module_i2c_driver(sx9310_driver);
