Extend i2c_device_get_match_data() to i2c sysfs interface for
retrieving match data from the match table.
Suggested-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Suggested-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Signed-off-by: Biju Das <biju.das.jz@xxxxxxxxxxxxxx>
---
v5:
* Separated non-static function change as separate patch#3
* Replaced 'dev->driver'->'drv'.
* Replaced return value data->NULL to avoid (potentially) stale pointers,
if there is no match.
v4:
* split from patch #2
* Added space after of_device_id for i2c_of_match_device_sysfs()
* Added const parameter for struct i2c_client, to prevent overriding it's
pointer.
* Moved declaration from public i2c.h->i2c-core.h
---
drivers/i2c/i2c-core-base.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index e738cfba9c3b..d543460e47c2 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -130,6 +130,7 @@ static const void *i2c_device_get_match_data(const struct device *dev)
{
const struct device_driver *drv = dev->driver;
const struct i2c_client *client;
+ const void *data;
/*
* It is not guaranteed that the function is always called on a device
@@ -144,7 +145,19 @@ static const void *i2c_device_get_match_data(const struct device *dev)
if (!client)
return NULL;
- return i2c_get_match_data_helper(client);
+ data = i2c_get_match_data_helper(client);
+ if (data)
+ return data;
+
+ if (drv->of_match_table) {
+ const struct of_device_id *match;
+
+ match = i2c_of_match_device_sysfs(drv->of_match_table, client);
+ if (match)
+ return match->data;
+ }
+
+ return NULL;
}
const void *i2c_get_match_data(const struct i2c_client *client)
--
2.25.1
