Commit a867e898 authored by Jonathan Cameron's avatar Jonathan Cameron

iio:chemical:atlas-sensor: Drop of_match_ptr and use generic fw accessors

of_match_ptr() prevents use of this driver with ACPI via PRP0001 and is
an example of an anti pattern I'm trying to remove from IIO.
Hence drop from this driver and use generic fw accessors to check
if there is a fw_node and get the id.

It might be neater to use pointers rather than indexes for
the device_data but that is another issue and should be handled
separately.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarMatt Ranostay <matt.ranostay@konsulko.com>
Link: https://lore.kernel.org/r/20200910173242.621168-26-jic23@kernel.org
parent 4d36d4df
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/irq_work.h> #include <linux/irq_work.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/of_device.h> #include <linux/mod_devicetable.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/iio/buffer.h> #include <linux/iio/buffer.h>
...@@ -620,7 +620,6 @@ static int atlas_probe(struct i2c_client *client, ...@@ -620,7 +620,6 @@ static int atlas_probe(struct i2c_client *client,
{ {
struct atlas_data *data; struct atlas_data *data;
struct atlas_device *chip; struct atlas_device *chip;
const struct of_device_id *of_id;
struct iio_trigger *trig; struct iio_trigger *trig;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
int ret; int ret;
...@@ -629,11 +628,10 @@ static int atlas_probe(struct i2c_client *client, ...@@ -629,11 +628,10 @@ static int atlas_probe(struct i2c_client *client,
if (!indio_dev) if (!indio_dev)
return -ENOMEM; return -ENOMEM;
of_id = of_match_device(atlas_dt_ids, &client->dev); if (!dev_fwnode(&client->dev))
if (!of_id)
chip = &atlas_devices[id->driver_data]; chip = &atlas_devices[id->driver_data];
else else
chip = &atlas_devices[(unsigned long)of_id->data]; chip = &atlas_devices[(unsigned long)device_get_match_data(&client->dev)];
indio_dev->info = &atlas_info; indio_dev->info = &atlas_info;
indio_dev->name = ATLAS_DRV_NAME; indio_dev->name = ATLAS_DRV_NAME;
...@@ -775,7 +773,7 @@ static const struct dev_pm_ops atlas_pm_ops = { ...@@ -775,7 +773,7 @@ static const struct dev_pm_ops atlas_pm_ops = {
static struct i2c_driver atlas_driver = { static struct i2c_driver atlas_driver = {
.driver = { .driver = {
.name = ATLAS_DRV_NAME, .name = ATLAS_DRV_NAME,
.of_match_table = of_match_ptr(atlas_dt_ids), .of_match_table = atlas_dt_ids,
.pm = &atlas_pm_ops, .pm = &atlas_pm_ops,
}, },
.probe = atlas_probe, .probe = atlas_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment