From patchwork Tue Jan 10 23:30:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 41706 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3030536wrt; Tue, 10 Jan 2023 15:53:30 -0800 (PST) X-Google-Smtp-Source: AMrXdXvJckFAA3mphomFqbQtU0EVGOafTh3HBwhrGuOVjJtBawpXRwTQJH4wWgaRG/GdVqtDqLNt X-Received: by 2002:a17:90a:30c:b0:226:42ea:28cd with SMTP id 12-20020a17090a030c00b0022642ea28cdmr40300524pje.16.1673394810203; Tue, 10 Jan 2023 15:53:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673394810; cv=none; d=google.com; s=arc-20160816; b=iUz2EBnsoUNcAXQHv7oa6RIlh4s5xMVPDZK5fxm8EzLrT4pROOblZYlY3UkP8BpguU RkXtUkyZtqti4dyusKRF1uevqAz5JZncJIAYQYHyNXlSChjZU9dQw3X9ZP9h1brCTfF9 h2z1Cm3BSQAHoU8fTfnCjTBUNStFtoXpSJDNLgzx0brcb+zcn6XBuv+APnfFqohRVS6k 7ofRBD4Cds1+YMbQo5aeFAyAALXEPkw3QEBm8vERSCSmZxy7kHdNe7ldmVLpiJpoCM0v HqKWNEAnr+hCuXLcpH2TnmkV7PEKclpdPkANzGQ/PgzAlLK/D1pYYwzWyiAF0dvkcwbM esyg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=uNyx0haHjJoxKFFueQ3KWf5AQdAhtMwQ9rgeolDKga4=; b=yyav/AVRPo1eNQE6QmTXLJf7/dD2uYKVPaL3dNco/g2LKX1nUD2mti4Ytc4lSEtT+S CbnT/5Zwz3M+bTZynjQ2MlXZT4Qo2PE83merJoS1WEhoryQGxh+X5dPUnqiEp8oJOGTX wre5FXc5uF2Qg8RgK9ZFrQ+uKgqIGIqhjPXO14uIYq6lvt/sSw+q85Zy6vnAZ9ZNRms0 HNyucc02hM010r/7oW3+vfYo5kROyGVbnGo4jJyqsDQ3b0o683Rtp9DQPkvzTyJo8x/g 1W58oOLQpNBz6zyeOHpKbnog+4q62dmFItuwBDSe3YAk9LJM4fYFGHSQQLcVqLhyvjFf 56dw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@walle.cc header.s=mail2022082101 header.b=lUislzKU; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=walle.cc Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id em9-20020a17090b014900b00219648ff3a5si6539930pjb.171.2023.01.10.15.53.16; Tue, 10 Jan 2023 15:53:30 -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=@walle.cc header.s=mail2022082101 header.b=lUislzKU; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=walle.cc Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234788AbjAJXbN (ORCPT + 99 others); Tue, 10 Jan 2023 18:31:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229538AbjAJXbK (ORCPT ); Tue, 10 Jan 2023 18:31:10 -0500 Received: from mail.3ffe.de (0001.3ffe.de [IPv6:2a01:4f8:c0c:9d57::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E2161106; Tue, 10 Jan 2023 15:31:04 -0800 (PST) Received: from mwalle01.kontron.local. (unknown [213.135.10.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.3ffe.de (Postfix) with ESMTPSA id 6C9D11243; Wed, 11 Jan 2023 00:31:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2022082101; t=1673393461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=uNyx0haHjJoxKFFueQ3KWf5AQdAhtMwQ9rgeolDKga4=; b=lUislzKU+2O3FtXw/nqElV8jsVrZFEfjHW9gCCpvIEFoDXi3OPVdGu6WFFKiqaioox8Upr lP7FZ+bfcZubS/ZdSG80/aOU/gEcMF+MvP6WVrzoe52q7fmzBJHlluZOB/yhe6g2Mu21Zn wtGE1TMINESOU6YAJ5L0ReqG1YniRbyeZRthV7bTIsJ6KwzLZnvKnfGc8NZnO16QWdPxAi kQfBy9xIQQmRGGc0n/uehkYlAGnZKz43Jc3UVXyqbyvHOBW0hw52jO5OcOWbglnaQDmiE1 TR2pj4gLtpLsuMwiMueH4DUjIsj1P9F92C3Ca1nCQZrjZhDJvcdbRYV/+1V7Ww== From: Michael Walle To: Rob Herring , Frank Rowand , Srinivas Kandagatla , Robert Marko , Alexander Stein , Peng Fan , Miquel Raynal Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Aisheng Dong , Michael Walle Subject: [PATCH] of: property: fix #nvmem-cell-cells parsing Date: Wed, 11 Jan 2023 00:30:56 +0100 Message-Id: <20230110233056.3490942-1-michael@walle.cc> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam: Yes X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1754681636278855288?= X-GMAIL-MSGID: =?utf-8?q?1754681636278855288?= Commit 67b8497f005f ("of: property: make #.*-cells optional for simple props") claims to make the cells-name property optional for simple properties, but changed the code for the wrong property, i.e. for DEFINE_SUFFIX_PROP(). Fix that. Fixes: 67b8497f005f ("of: property: make #.*-cells optional for simple props") Reported-by: Peng Fan Signed-off-by: Michael Walle Tested-by: Robert Marko Tested-by: Peng Fan Acked-by: Rob Herring --- drivers/of/property.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/of/property.c b/drivers/of/property.c index 8d9ba20a8f90..95b838185b2f 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -1202,8 +1202,8 @@ static struct device_node *parse_prop_cells(struct device_node *np, if (strcmp(prop_name, list_name)) return NULL; - if (of_parse_phandle_with_args(np, list_name, cells_name, index, - &sup_args)) + if (__of_parse_phandle_with_args(np, list_name, cells_name, 0, index, + &sup_args)) return NULL; return sup_args.np; @@ -1256,8 +1256,8 @@ static struct device_node *parse_suffix_prop_cells(struct device_node *np, if (strcmp_suffix(prop_name, suffix)) return NULL; - if (__of_parse_phandle_with_args(np, prop_name, cells_name, 0, index, - &sup_args)) + if (of_parse_phandle_with_args(np, prop_name, cells_name, index, + &sup_args)) return NULL; return sup_args.np;