From patchwork Wed Feb 1 17:31:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 9550333 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E45E360425 for ; Wed, 1 Feb 2017 17:33:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D68762040D for ; Wed, 1 Feb 2017 17:33:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB89928435; Wed, 1 Feb 2017 17:33:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8459D2040D for ; Wed, 1 Feb 2017 17:33:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753577AbdBARbf (ORCPT ); Wed, 1 Feb 2017 12:31:35 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:34137 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753032AbdBARbb (ORCPT ); Wed, 1 Feb 2017 12:31:31 -0500 Received: by mail-pg0-f66.google.com with SMTP id 3so16972662pgj.1; Wed, 01 Feb 2017 09:31:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uH9h5WQYXAoqdv+SJu6NhB0lf+sbHXTzvf4ZglKGaMU=; b=hZ4UinxO5ZMbAL77vfw/onF3Vr8NDtl8EEj8Fu6FIfFrl/Jt5bajAzRUVnYIFFpBvm V1OLe8FKaUmKgBth20QcxD8XhdEI1JlxwwoxH8sMU5kW60iZ+1Eskr4RttSlf1qmDpsl TM53jiBko9CgFaSNeZ6k9CoFGYc14/HuWrCsVqdLWIu6hYmoOuSa6r09H55bauI3LAeU ZGiqIfZbCmbuPExEGkWjI7FSPQYSQZh4Akzj/mqfxkP2/5eh+ZOKC1NFpeHQ9Nu0OQMF DkcrJ86cz6lbeRIqg2rdQCmvWT4k+UHeW1wl22zKhVNSjqnLJQsIohLcU0cdGT1XQ2AB XvHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uH9h5WQYXAoqdv+SJu6NhB0lf+sbHXTzvf4ZglKGaMU=; b=d1dDkmGlVWmz6rxU5W1Wy/ZyDJM9ermRQdGOXCC0r310DpFdUkZOkSECNl7pveSZYl m2mIP/hJHzMkAcMkAc6SboCMZuZo+X2fOWYgeKcdg5pUjQATjY65UAVyr8he5Bbr61eu RsVISVnrs3Ojie9nJ+PJpulreJ5tWrEfjnJGL9To9bhsYeRgoLH++ZmXlByVMZWR7zB4 R9sfEra2oAOKWfAiTCYsPdGITZcPqoi0DfR+kZV59AI0QBpI8499qALXAHFOryeZ5r5x 4f0riaG/rrJlRWvF09KvY2+OidGpSqfgteof4jGRRTOpEZ4Il5bjMaqZFkJNSN29Cr2p SY9Q== X-Gm-Message-State: AIkVDXKnYxWq73OTmq113lI0KDJj+55UFliPxzqB5tNvXFcdxtR3f1ufIpTtXvEF22NMTQ== X-Received: by 10.98.192.72 with SMTP id x69mr5015428pff.129.1485970290934; Wed, 01 Feb 2017 09:31:30 -0800 (PST) Received: from dtor-ws.mtv.corp.google.com ([172.22.152.34]) by smtp.gmail.com with ESMTPSA id u14sm51170803pfg.18.2017.02.01.09.31.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Feb 2017 09:31:30 -0800 (PST) From: Dmitry Torokhov To: "Rafael J. Wysocki" Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Mika Westerberg , Hans de Goede , Wolfram Sang Subject: [PATCH v3 4/4] i2c: allow specify device properties in i2c_board_info Date: Wed, 1 Feb 2017 09:31:25 -0800 Message-Id: <20170201173125.40354-5-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog In-Reply-To: <20170201173125.40354-1-dmitry.torokhov@gmail.com> References: <20170201173125.40354-1-dmitry.torokhov@gmail.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Mika Westerberg --- 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; };