From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754191AbdBGMoL (ORCPT ); Tue, 7 Feb 2017 07:44:11 -0500 Received: from mail-oi0-f65.google.com ([209.85.218.65]:36439 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753955AbdBGMoG (ORCPT ); Tue, 7 Feb 2017 07:44:06 -0500 MIME-Version: 1.0 In-Reply-To: <20170203014128.317-5-dmitry.torokhov@gmail.com> References: <20170203014128.317-1-dmitry.torokhov@gmail.com> <20170203014128.317-5-dmitry.torokhov@gmail.com> From: "Rafael J. Wysocki" Date: Tue, 7 Feb 2017 13:44:05 +0100 X-Google-Sender-Auth: Y6Euy7t4gZVwJlHfruF_w3Z6Gdw Message-ID: Subject: Re: [PATCH v5 4/4] i2c: allow specify device properties in i2c_board_info To: Dmitry Torokhov , Wolfram Sang Cc: "Rafael J. Wysocki" , ACPI Devel Maling List , Linux Kernel Mailing List , Andy Shevchenko , Mika Westerberg , Hans de Goede Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 3, 2017 at 2:41 AM, 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. > > Signed-off-by: Dmitry Torokhov Hi Wolfram, Any objections here? > --- > 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; > }; > > -- Thanks, Rafael