From patchwork Fri Jan 27 11:15:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 49226 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp778871wrn; Fri, 27 Jan 2023 03:22:29 -0800 (PST) X-Google-Smtp-Source: AK7set+EoFoyUesJi2qTup2BoVLWy991pPoIHFbcFk98+2ehZjrRLy48AU7KBoB4VxlvjJY6T0iv X-Received: by 2002:a17:90b:17ca:b0:22c:4693:ca93 with SMTP id me10-20020a17090b17ca00b0022c4693ca93mr2672828pjb.20.1674818549492; Fri, 27 Jan 2023 03:22:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674818549; cv=none; d=google.com; s=arc-20160816; b=kObgfqyPTGMZY7fVvQG5BarfjGfkqLygGEPp1D5VCF1OrCFJ6X7licX8mTNsnfk8PB VogO1N4F0SWUWb8xNYL0WOAqlzHp9ujQ4D/sw4l44ip9g7IlgQYKI3+qii+goRPx3Ij5 5wT6mFntJtzxirs6e8g576mPIF290UqNOnIEtUPjOWpkxKU73O1AnQBcQxeP9SilaziW 9p7pI2lxfLbLCQ0jJjMX61meP3MQbvYNLp+FLMr7AYpAqEKZGJhSIY4XdVuPgrsDCzNH uETunUfVktUxiCG9Ok5qIIsP5FYUuIheLLbbWPRtwsYMXGt5YLFENO0EOf0+z6WhLevW 4+RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pkPn4xoX0BLwonOlTuXlD3Roc+kHwzmJD8rg60cQtPs=; b=PjS8bc43ufp8pesnO/+0W7a1pZrGs7PGb4DXhkrJvhwN8J8Ghr+txop/PelejTOQSl GsKv3OyT7C25mrzFTMXqkrQN2lXXYDs+R1CSFPBg7+PXlAgt2ZAx68AnBQ0+c5veWnXa U3zKkCvIARAdQjOy9uZYkEKGj+3ziXr2lPXg5aYU0ACWB1ELlFGJanhQC+S5GK+JDQV7 Okhnk3+ktkg76hKUmklauSKajUZmRugMehEJ5gyl6MaXfPiyXnqxprkha3eCuAudHbMS DJ72s7gwsod4IF/ft5IzMkkjaU8DE9GFDrtddpYB5ek0y+dcU7JT3+vxkE+QOLsJqnk8 eWjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R9HACK1G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r89-20020a17090a43e200b00229242a29afsi4520380pjg.124.2023.01.27.03.22.17; Fri, 27 Jan 2023 03:22:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R9HACK1G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232879AbjA0LTq (ORCPT + 99 others); Fri, 27 Jan 2023 06:19:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233053AbjA0LS5 (ORCPT ); Fri, 27 Jan 2023 06:18:57 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBD6387362 for ; Fri, 27 Jan 2023 03:18:23 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id m14so4201424wrg.13 for ; Fri, 27 Jan 2023 03:18:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pkPn4xoX0BLwonOlTuXlD3Roc+kHwzmJD8rg60cQtPs=; b=R9HACK1GyT0gOembwAPjqHw04bfjT1xYkH1nNfXQxVXWzbOAas4LJp4raaahehoMro ECPgF6pAZLKSRf27tGkMUGaNnPrQ+dIl0mu7I9UrcmZYjaTLTY7hsyOQJ0e3GDn2TRgJ d56qmiL3toNR9zbI13S4Hq1/MZ7y7Z6v/M+CEmFfTnXFmagdu36RiNsXeXpYOfUq7+Cg HtivHGudL50d3Mb3emNMWlgv9i4EpF3PyOCiHrPrWJZQqbTgTqZQ4FS8/nI7R05PkuDU ANCUhQEJdAFkQh9DccOqZ2vhMwaosOdUq1An77bpXYRXgP/6xi3W05kPNDvTBvyXfoFa K+pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pkPn4xoX0BLwonOlTuXlD3Roc+kHwzmJD8rg60cQtPs=; b=xRpHGMVogIVWXE1wMNXHJp7TdbxmSmfaygCuRrV6gaeALIJvIhyKA4+oglZcbpIA9J qprRt+HhXm7lp5nquLhkBUky7/TU1UKZ3XsIQ9k/Qc8z0uFqCIkpsvSzBraQZLH0EpmB guuT9hIWKT3QYIDaxc62XZtMdMEVFSP0/5q+RqU23tUFLzxpy0C38neC2BN135KScYOU L8ZUZ6XwcGduYxBeKA5RrO0lttFlBCZ+Tm2peSM7ZAQ4nnBDQ62zBO3kW9UmER0fSeOd t2Z4mAJfOHt9q6JhCkfuZNHLrd8tDJdh3YHH6xR1ucciiB6iWZcGTK3XN8/eEt4j8gnu gudQ== X-Gm-Message-State: AO0yUKXfyeC3KcJTDSSv3ZQ1thIZnA0APWAjZ2SsFhQXMYoDluVjYOWy U/qnk7m4gB0W/polL22hNgNn1Q== X-Received: by 2002:a5d:4ece:0:b0:2bf:d72b:d039 with SMTP id s14-20020a5d4ece000000b002bfd72bd039mr558757wrv.10.1674818300244; Fri, 27 Jan 2023 03:18:20 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id c13-20020adffb0d000000b002bfd190fd60sm1843314wrr.108.2023.01.27.03.18.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 03:18:19 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Michael Walle , Srinivas Kandagatla Subject: [PATCH 30/37] nvmem: core: fix nvmem_layout_get_match_data() Date: Fri, 27 Jan 2023 11:15:58 +0000 Message-Id: <20230127111605.25958-31-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127111605.25958-1-srinivas.kandagatla@linaro.org> References: <20230127111605.25958-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756174535394028890?= X-GMAIL-MSGID: =?utf-8?q?1756174535394028890?= From: Rafał Miłecki This function was trying to match wrong OF node (parent device's) against an of_match_table. It was always returning NULL. Make it match layout's OF node against layout's of_match_table. Note: __maybe_unused is needed to avoid: warning: variable 'layout_np' set but not used [-Wunused-but-set-variable] (of_match_node() is no-op without CONFIG_OF). Fixes: f61a093b4a0e ("nvmem: core: introduce NVMEM layouts") Signed-off-by: Rafał Miłecki Reviewed-by: Michael Walle Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 30057b0094a2..38a5728bc65c 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -824,9 +824,11 @@ EXPORT_SYMBOL_GPL(of_nvmem_layout_get_container); const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem, struct nvmem_layout *layout) { + struct device_node __maybe_unused *layout_np; const struct of_device_id *match; - match = of_match_node(layout->of_match_table, nvmem->dev.of_node); + layout_np = of_nvmem_layout_get_container(nvmem); + match = of_match_node(layout->of_match_table, layout_np); return match ? match->data : NULL; }