Commit 4c55fb8c authored by Jonathan Cameron's avatar Jonathan Cameron

iio:potentiostat:lmp91000: Drop of_match_ptr and use generic fw accessors

This change allows use of this driver with ACPI via PRP0001 and removes
an example of an anti pattern I'm trying to remove from IIO.
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-17-jic23@kernel.org
parent 16723c6e
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/of.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>
...@@ -205,13 +205,12 @@ static const struct iio_info lmp91000_info = { ...@@ -205,13 +205,12 @@ static const struct iio_info lmp91000_info = {
static int lmp91000_read_config(struct lmp91000_data *data) static int lmp91000_read_config(struct lmp91000_data *data)
{ {
struct device *dev = data->dev; struct device *dev = data->dev;
struct device_node *np = dev->of_node;
unsigned int reg, val; unsigned int reg, val;
int i, ret; int i, ret;
ret = of_property_read_u32(np, "ti,tia-gain-ohm", &val); ret = device_property_read_u32(dev, "ti,tia-gain-ohm", &val);
if (ret) { if (ret) {
if (!of_property_read_bool(np, "ti,external-tia-resistor")) { if (!device_property_read_bool(dev, "ti,external-tia-resistor")) {
dev_err(dev, "no ti,tia-gain-ohm defined and external resistor not specified\n"); dev_err(dev, "no ti,tia-gain-ohm defined and external resistor not specified\n");
return ret; return ret;
} }
...@@ -232,7 +231,7 @@ static int lmp91000_read_config(struct lmp91000_data *data) ...@@ -232,7 +231,7 @@ static int lmp91000_read_config(struct lmp91000_data *data)
return ret; return ret;
} }
ret = of_property_read_u32(np, "ti,rload-ohm", &val); ret = device_property_read_u32(dev, "ti,rload-ohm", &val);
if (ret) { if (ret) {
val = 100; val = 100;
dev_info(dev, "no ti,rload-ohm defined, default to %d\n", val); dev_info(dev, "no ti,rload-ohm defined, default to %d\n", val);
...@@ -422,7 +421,7 @@ MODULE_DEVICE_TABLE(i2c, lmp91000_id); ...@@ -422,7 +421,7 @@ MODULE_DEVICE_TABLE(i2c, lmp91000_id);
static struct i2c_driver lmp91000_driver = { static struct i2c_driver lmp91000_driver = {
.driver = { .driver = {
.name = LMP91000_DRV_NAME, .name = LMP91000_DRV_NAME,
.of_match_table = of_match_ptr(lmp91000_of_match), .of_match_table = lmp91000_of_match,
}, },
.probe = lmp91000_probe, .probe = lmp91000_probe,
.remove = lmp91000_remove, .remove = lmp91000_remove,
......
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