summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Cameron <Jonathan.Cameron@huawei.com>2022-11-14 20:38:30 +0000
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2022-11-23 20:01:38 +0000
commitb15654dd11e62ed348d5ec7f93b8ea3ad72f8c56 (patch)
tree24c68f28d47c543ed23fd5637133f12bb807d9c0
parentd94fbd9231a2b4062cf5972629999402ea7dd6fa (diff)
parent662233731d66cf41e7494e532e702849c8ce18f3 (diff)
downloadlinux-stable-b15654dd11e62ed348d5ec7f93b8ea3ad72f8c56.tar.gz
linux-stable-b15654dd11e62ed348d5ec7f93b8ea3ad72f8c56.tar.bz2
linux-stable-b15654dd11e62ed348d5ec7f93b8ea3ad72f8c56.zip
Merge remote-tracking branch 'i2c/i2c/client_device_id_helper-immutable' into togreg
-rw-r--r--drivers/i2c/i2c-core-base.c14
-rw-r--r--include/linux/i2c.h1
2 files changed, 15 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index b4edf10e8fd0..9aa7b9d9a485 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -2236,6 +2236,20 @@ int i2c_get_device_id(const struct i2c_client *client,
}
EXPORT_SYMBOL_GPL(i2c_get_device_id);
+/**
+ * i2c_client_get_device_id - get the driver match table entry of a device
+ * @client: the device to query. The device must be bound to a driver
+ *
+ * Returns a pointer to the matching entry if found, NULL otherwise.
+ */
+const struct i2c_device_id *i2c_client_get_device_id(const struct i2c_client *client)
+{
+ const struct i2c_driver *drv = to_i2c_driver(client->dev.driver);
+
+ return i2c_match_id(drv->id_table, client);
+}
+EXPORT_SYMBOL_GPL(i2c_client_get_device_id);
+
/* ----------------------------------------------------
* the i2c address scanning function
* Will not work for 10-bit addresses!
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index f7c49bbdb8a1..d84e0e99f084 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -189,6 +189,7 @@ s32 i2c_smbus_read_i2c_block_data_or_emulated(const struct i2c_client *client,
u8 *values);
int i2c_get_device_id(const struct i2c_client *client,
struct i2c_device_identity *id);
+const struct i2c_device_id *i2c_client_get_device_id(const struct i2c_client *client);
#endif /* I2C */
/**