Hi Biju,
On Sun, Jul 23, 2023 at 10:37 AM Biju Das <biju.das.jz@xxxxxxxxxxxxxx> wrote:
> Add i2c_device_get_match_data() callback to struct bus_type().
>
> While at it, introduced i2c_get_match_data_helper() to avoid code
> duplication with i2c_get_match_data().
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> Signed-off-by: Biju Das <biju.das.jz@xxxxxxxxxxxxxx>
Thanks for your patch!
> --- a/drivers/i2c/i2c-core-base.c
> +++ b/drivers/i2c/i2c-core-base.c
> @@ -114,20 +114,41 @@ const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
> }
> EXPORT_SYMBOL_GPL(i2c_match_id);
>
> +static void *i2c_get_match_data_helper(struct i2c_driver *driver,
static const void *
> + const struct i2c_client *client)
> +{
> + const struct i2c_device_id *match;
> +
> + match = i2c_match_id(driver->id_table, client);
> + if (!match)
> + return NULL;
> +
> + return (const void *)match->driver_data;
I guess your compiler didn't complain about the const/non-const
conversion when returning because it inlined the function?
> +}
> +
> +static const void *i2c_device_get_match_data(const struct device *dev)
> +{
> + const struct i2c_client *client = to_i2c_client(dev);
> + const struct i2c_driver *driver;
> +
> + if (!dev->driver)
> + return NULL;
> +
> + driver = to_i2c_driver(dev->driver);
> + if (!driver)
> + return NULL;
"driver" can never be NULL here.
> +
> + return i2c_get_match_data_helper(driver, client);
> +}
> +
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
