[PATCHv7,05/11] i2c: Export i2c_match_id() for direct use by device drivers

Message ID 1478522866-29620-6-git-send-email-kieran@bingham.xyz
State New
Headers show

Commit Message

Kieran Bingham Nov. 7, 2016, 12:47 p.m.
From: Lee Jones <lee.jones@linaro.org>

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@linaro.org>

Signed-off-by: Lee Jones <lee.jones@linaro.org>

Tested-by: Kieran Bingham <kieran@bingham.xyz>

Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>

Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>

Signed-off-by: Kieran Bingham <kieran@bingham.xyz>

 drivers/i2c/i2c-core.c | 3 ++-
 include/linux/i2c.h    | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)


To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 6439174c0ff5..48237d035246 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -676,7 +676,7 @@  static inline int i2c_acpi_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))
@@ -689,6 +689,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 c0a4a12815aa..7e00efd6a62f 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -243,6 +243,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)