[PATCHv5 5/8] i2c: Export i2c_match_id() for direct use by device drivers

From: Kieran Bingham
Date: Wed May 04 2016 - 11:15:26 EST

From: Lee Jones <lee.jones@xxxxxxxxxx>

When there was no other way to match a I2C device to driver i2c_match_id()
was exclusively used. However, now there are other types of tables which
are commonly supplied, matching on an i2c_device_id table is used less
frequently. Instead of _always_ calling i2c_match_id() from within the
framework, we only need to do so from drivers which have no other way of
matching. This patch makes i2c_match_id() available to the aforementioned
device drivers.

Acked-by: Grant Likely <grant.likely@xxxxxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
Signed-off-by: Kieran Bingham <kieran@xxxxxxxxxxx>
Tested-by: Kieran Bingham <kieran@xxxxxxxxxxx>
drivers/i2c/i2c-core.c | 3 ++-
include/linux/i2c.h | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index dd5a19ee92af..64d543b041b1 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -490,7 +490,7 @@ static inline int acpi_i2c_install_space_handler(struct i2c_adapter *adapter)

/* ------------------------------------------------------------------------- */

-static const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
+const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
const struct i2c_client *client)
if (!(id && client))
@@ -503,6 +503,7 @@ static const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
return NULL;

static int i2c_device_match(struct device *dev, struct device_driver *drv)
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 547d213d2a33..e3aa3f5e59a8 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -235,6 +235,8 @@ struct i2c_client {

extern struct i2c_client *i2c_verify_client(struct device *dev);
extern struct i2c_adapter *i2c_verify_adapter(struct device *dev);
+extern const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
+ const struct i2c_client *client);

static inline struct i2c_client *kobj_to_i2c_client(struct kobject *kobj)