Skip to content

Commit 5f441fc

Browse files
Lee JonesWolfram Sang
Lee Jones
authored and
Wolfram Sang
committed
i2c: Export i2c_match_id() for direct use by device drivers
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> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
1 parent da10c06 commit 5f441fc

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

drivers/i2c/i2c-core.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ static inline int i2c_acpi_install_space_handler(struct i2c_adapter *adapter)
676676

677677
/* ------------------------------------------------------------------------- */
678678

679-
static const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
679+
const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
680680
const struct i2c_client *client)
681681
{
682682
if (!(id && client))
@@ -689,6 +689,7 @@ static const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
689689
}
690690
return NULL;
691691
}
692+
EXPORT_SYMBOL_GPL(i2c_match_id);
692693

693694
static int i2c_device_match(struct device *dev, struct device_driver *drv)
694695
{

include/linux/i2c.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,8 @@ struct i2c_client {
243243

244244
extern struct i2c_client *i2c_verify_client(struct device *dev);
245245
extern struct i2c_adapter *i2c_verify_adapter(struct device *dev);
246+
extern const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
247+
const struct i2c_client *client);
246248

247249
static inline struct i2c_client *kobj_to_i2c_client(struct kobject *kobj)
248250
{

0 commit comments

Comments
 (0)