From patchwork Thu Aug 3 10:31:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 13339688 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E75FC04E69 for ; Thu, 3 Aug 2023 10:31:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235188AbjHCKbX (ORCPT ); Thu, 3 Aug 2023 06:31:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233628AbjHCKbW (ORCPT ); Thu, 3 Aug 2023 06:31:22 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 941F019B0; Thu, 3 Aug 2023 03:31:21 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.01,251,1684767600"; d="scan'208";a="171795822" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 03 Aug 2023 19:31:21 +0900 Received: from localhost.localdomain (unknown [10.226.93.128]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 0208F41CDEB3; Thu, 3 Aug 2023 19:31:18 +0900 (JST) From: Biju Das To: Wolfram Sang Cc: Biju Das , linux-i2c@vger.kernel.org, Geert Uytterhoeven , Dmitry Torokhov , Andy Shevchenko , linux-renesas-soc@vger.kernel.org Subject: [PATCH v5 RESEND 4/4] i2c: Extend i2c_device_get_match_data() to support i2c sysfs Date: Thu, 3 Aug 2023 11:31:02 +0100 Message-Id: <20230803103102.323987-5-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230803103102.323987-1-biju.das.jz@bp.renesas.com> References: <20230803103102.323987-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Extend i2c_device_get_match_data() to i2c sysfs interface for retrieving match data from the match table. Suggested-by: Andy Shevchenko Suggested-by: Dmitry Torokhov Signed-off-by: Biju Das --- v5: * Separated non-static function change as separate patch#3 * Replaced 'dev->driver'->'drv'. * Replaced return value data->NULL to avoid (potentially) stale pointers, if there is no match. v4: * split from patch #2 * Added space after of_device_id for i2c_of_match_device_sysfs() * Added const parameter for struct i2c_client, to prevent overriding it's pointer. * Moved declaration from public i2c.h->i2c-core.h --- drivers/i2c/i2c-core-base.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index e738cfba9c3b..d543460e47c2 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -130,6 +130,7 @@ static const void *i2c_device_get_match_data(const struct device *dev) { const struct device_driver *drv = dev->driver; const struct i2c_client *client; + const void *data; /* * It is not guaranteed that the function is always called on a device @@ -144,7 +145,19 @@ static const void *i2c_device_get_match_data(const struct device *dev) if (!client) return NULL; - return i2c_get_match_data_helper(client); + data = i2c_get_match_data_helper(client); + if (data) + return data; + + if (drv->of_match_table) { + const struct of_device_id *match; + + match = i2c_of_match_device_sysfs(drv->of_match_table, client); + if (match) + return match->data; + } + + return NULL; } const void *i2c_get_match_data(const struct i2c_client *client)