Commit 20e39f3a authored by Jonathan Cameron's avatar Jonathan Cameron

iio:potentiometer:mcp4531: Drop of_match_ptr and CONFIG_OF protections.

These prevent use of this driver with ACPI via PRP0001 and are
an example of an anti pattern I'm trying to remove from IIO.
Hence drop them from this driver.

Also switch to device_get_match_data() from of_ variant and adjust
headers to reflect the change.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Cc: Peter Rosin <peda@axentia.se>
Link: https://lore.kernel.org/r/20200910173242.621168-9-jic23@kernel.org
parent a51a8349
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/of.h> #include <linux/mod_devicetable.h>
#include <linux/of_device.h> #include <linux/property.h>
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
...@@ -275,8 +275,6 @@ static const struct i2c_device_id mcp4531_id[] = { ...@@ -275,8 +275,6 @@ static const struct i2c_device_id mcp4531_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, mcp4531_id); MODULE_DEVICE_TABLE(i2c, mcp4531_id);
#ifdef CONFIG_OF
#define MCP4531_COMPATIBLE(of_compatible, cfg) { \ #define MCP4531_COMPATIBLE(of_compatible, cfg) { \
.compatible = of_compatible, \ .compatible = of_compatible, \
.data = &mcp4531_cfg[cfg], \ .data = &mcp4531_cfg[cfg], \
...@@ -350,7 +348,6 @@ static const struct of_device_id mcp4531_of_match[] = { ...@@ -350,7 +348,6 @@ static const struct of_device_id mcp4531_of_match[] = {
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, mcp4531_of_match); MODULE_DEVICE_TABLE(of, mcp4531_of_match);
#endif
static int mcp4531_probe(struct i2c_client *client) static int mcp4531_probe(struct i2c_client *client)
{ {
...@@ -371,7 +368,7 @@ static int mcp4531_probe(struct i2c_client *client) ...@@ -371,7 +368,7 @@ static int mcp4531_probe(struct i2c_client *client)
i2c_set_clientdata(client, indio_dev); i2c_set_clientdata(client, indio_dev);
data->client = client; data->client = client;
data->cfg = of_device_get_match_data(dev); data->cfg = device_get_match_data(dev);
if (!data->cfg) if (!data->cfg)
data->cfg = &mcp4531_cfg[i2c_match_id(mcp4531_id, client)->driver_data]; data->cfg = &mcp4531_cfg[i2c_match_id(mcp4531_id, client)->driver_data];
...@@ -386,7 +383,7 @@ static int mcp4531_probe(struct i2c_client *client) ...@@ -386,7 +383,7 @@ static int mcp4531_probe(struct i2c_client *client)
static struct i2c_driver mcp4531_driver = { static struct i2c_driver mcp4531_driver = {
.driver = { .driver = {
.name = "mcp4531", .name = "mcp4531",
.of_match_table = of_match_ptr(mcp4531_of_match), .of_match_table = mcp4531_of_match,
}, },
.probe_new = mcp4531_probe, .probe_new = mcp4531_probe,
.id_table = mcp4531_id, .id_table = mcp4531_id,
......
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