Re: [PATCH v5 4/4] i2c: allow specify device properties in i2c_board_info
From: Andy Shevchenko
Date: Fri Feb 03 2017 - 06:48:48 EST
On Thu, 2017-02-02 at 17:41 -0800, Dmitry Torokhov wrote:
> With many drivers converting to using generic device properties, it is
> useful to provide array of device properties when instantiating new
> i2c
> client via i2c_board_info and have them automatically added to the
> device
> in question.
FWIW:
Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> ---
> Âdrivers/i2c/i2c-core.c | 16 +++++++++++++++-
> Âinclude/linux/i2c.hÂÂÂÂ|ÂÂ3 +++
> Â2 files changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> index f009549f86a5..3897e78e5e9a 100644
> --- a/drivers/i2c/i2c-core.c
> +++ b/drivers/i2c/i2c-core.c
> @@ -1335,15 +1335,29 @@ i2c_new_device(struct i2c_adapter *adap,
> struct i2c_board_info const *info)
> Â client->dev.fwnode = info->fwnode;
> Â
> Â i2c_dev_set_name(adap, client);
> +
> + if (info->properties) {
> + status = device_add_properties(&client->dev, info-
> >properties);
> + if (status) {
> + dev_err(&adap->dev,
> + "Failed to add properties to client
> %s: %d\n",
> + client->name, status);
> + goto out_err;
> + }
> + }
> +
> Â status = device_register(&client->dev);
> Â if (status)
> - goto out_err;
> + goto out_free_props;
> Â
> Â dev_dbg(&adap->dev, "client [%s] registered with bus id
> %s\n",
> Â client->name, dev_name(&client->dev));
> Â
> Â return client;
> Â
> +out_free_props:
> + if (info->properties)
> + device_remove_properties(&client->dev);
> Âout_err:
> Â dev_err(&adap->dev,
> Â "Failed to register i2c client %s at 0x%02x (%d)\n",
> diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> index 4aa7d244b38a..ec8f866a5656 100644
> --- a/include/linux/i2c.h
> +++ b/include/linux/i2c.h
> @@ -51,6 +51,7 @@ enum i2c_slave_event;
> Âtypedef int (*i2c_slave_cb_t)(struct i2c_client *, enum
> i2c_slave_event, u8 *);
> Â
> Âstruct module;
> +struct property_entry;
> Â
> Â#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
> Â/*
> @@ -310,6 +311,7 @@ static inline int i2c_slave_event(struct
> i2c_client *client,
> Â * @archdata: copied into i2c_client.dev.archdata
> Â * @of_node: pointer to OpenFirmware device node
> Â * @fwnode: device node supplied by the platform firmware
> + * @properties: additional device properties for the device
> Â * @irq: stored in i2c_client.irq
> Â *
> Â * I2C doesn't actually support hardware probing, although
> controllers and
> @@ -331,6 +333,7 @@ struct i2c_board_info {
> Â struct dev_archdata *archdata;
> Â struct device_node *of_node;
> Â struct fwnode_handle *fwnode;
> + const struct property_entry *properties;
> Â int irq;
> Â};
> Â
--
Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Intel Finland Oy