On Wed, 09 Sep 2015, Kieran Bingham wrote:
> 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>
SoB?
> ---
> 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 2ebc64d..0e40136 100644
> --- a/drivers/i2c/i2c-core.c
> +++ b/drivers/i2c/i2c-core.c
> @@ -447,7 +447,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))
> @@ -460,6 +460,7 @@ static const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
> }
> return NULL;
> }
> +EXPORT_SYMBOL_GPL(i2c_match_id);
>
> 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 48bbbab..126585c 100644
> --- a/include/linux/i2c.h
> +++ b/include/linux/i2c.h
> @@ -232,6 +232,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)
> {
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
