Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Peter Rosin <peda@axentia.se>
Link: https://lore.kernel.org/r/20200910173242.621168-9-jic23@kernel.org
This commit is contained in:
Jonathan Cameron 2020-09-10 18:32:12 +01:00
parent a51a834997
commit 20e39f3aa2
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/iio/potentiometer/mcp4531.c
View File

@ -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[] = {
}; };
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[] = {
{ /* 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)
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)
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,