From patchwork Thu Dec 28 19:39:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13506184 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 smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6324DC4706F for ; Thu, 28 Dec 2023 19:39:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) id 4C3C6C433C8; Thu, 28 Dec 2023 19:39:55 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.kernel.org (Postfix) with ESMTPS id 760ADC433C9; Thu, 28 Dec 2023 19:39:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 smtp.kernel.org 760ADC433C9 Authentication-Results: smtp.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.net Authentication-Results: smtp.kernel.org; spf=pass smtp.mailfrom=gmx.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1703792376; x=1704397176; i=wahrenst@gmx.net; bh=b0edislHopr8EPtQ1enGkNrsXXNvjXTznHe/lchgmc4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To: References; b=YU5K7KC9H4sIXdlU0G4CpXOyiPS8GzyjLpsyfO73x8/Y6ko2MAyIS2Q5t6sImetj F6HtzPrGFpKd3zZ9CMaEspdHEbWWV89if6iwEXDVr/daNIENZzfRiqt7lvxOSRCT5 M/EGmaYfO28KNr6qxylFFuS2E9JS2xUVv/jIzQOcAz2yKKpS7f9eAHwHDCTbNhXVa pmZdEDjb14Bh6za5dUegqBrTSjVQ7PkNkfHMv2Y3D5VFri4g3AqVekFQrflHummzH 325CDW5QoOJVNvX0xpdcHnKocAyRyUNdJf+XXx1bgvVaMppb2AVnu19YrJOqBryAA XRMURhUfJEsDn3V/1w== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from stefanw-SCHENKER ([37.4.248.43]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MD9X9-1rRUvx1okz-009BbN; Thu, 28 Dec 2023 20:39:36 +0100 From: Stefan Wahren To: Chen-Yu Tsai , Jernej Skrabec , Samuel Holland List-Id: Cc: Maxime Ripard , =?utf-8?q?Myl=C3=A8ne_Josserand?= , linux-sunxi@lists.linux.dev, soc@kernel.org, Florian Fainelli , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Stefan Wahren , Nick Desaulniers Subject: [PATCH V2 2/2] ARM: sun9i: smp: fix return code check of of_property_match_string Date: Thu, 28 Dec 2023 20:39:03 +0100 Message-Id: <20231228193903.9078-2-wahrenst@gmx.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231228193903.9078-1-wahrenst@gmx.net> References: <20231228193903.9078-1-wahrenst@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:ZkFHk/GUAFOj07mCKAFPN53ViYLKkHX2XMWirbFXT9iQfryqjfL xl73iQC00/oPWxShovRgVxTMrp6/uvMWaWRwwIRI09tmlSSTDrYrRN/sqP7J79olzMqS93O 7hX92IA2L52CefjNho2LxNZ33+/0DiTMYrcFnDqMSUbhLoy0zy1fbd6a2V6nnYU1uZN4CkB gXacDgawQLX0u8f8XAkCA== UI-OutboundReport: notjunk:1;M01:P0:mYahOp04Ofk=;SLmGj1svWcfzqHdMPlyxU1A+3FI dR/KpOtTiegOsXoIGmOmlmuZUeGH8yJCN015v9FKW4arSfrw5dJXrGI+tv762zsHAG17c1sVp E577DKQjSuf0GcFn+hV/kR67wpPU3HD29u/MZex+QGSKccVP1rJqhMrFV5vE68AnkevDVoBwi 0fcOh7xj1ENxJeQ+AX62h9oebphIgqVvR49BL3kVZA0nFsPvew6F2TNU2M+9jFbcZA98YtBJo 1KXH7fCCrziFqrAKG/OKbszgeTT5+Q6TfvnKv4pAmqYjGVdI11/03nHmEmOMX+Qv8VIClkROD eDrLJv9sit1DfxIFz07DX5m5nUo1rdpzBGrgDF/RJHBsqT1XmPb8HVVFr49ymeY0oextr/Pfr f2YaZR2IFTiFAv3Sdks2hwelnTKMcWnWWmRJc96Rq+wlSV0ZsvgcAU20nhDv9Rkzglj987NP5 8u6ZuGm/TeZRHzmcKJNMb8f88Z7q1JKRB9vOx8Pw5i3KB69jBgYc12QJfSlXt7kiJxsrw9gTE RuMnLr3HW7wXeuDnsZIuUjkia9NhhXnln7l1mjofz4X/n1Zx0rqfedc7nCGuxkANZIVKvzAKG TVu7UzvMeAgre2uK8FF0RIzaKLwjFwb9Gstx9Ef0ZuZdoGUOY9lvUtfqOQ+o9P21IMxcvlYSL cHfx0N7ScWrxJC9R+I9trLvvCppNTvuH0TU+DpysWSOIX9Q+g2bIvJ//4v4RWqb2/Lb0Kw6zn ducg8x+zUq61hONnrjemQQH/UBqGM8xE1Qc0H7b/1URh5/9EYCrpArzONhe7LwoUXHc5nay0Z HGejECeO7ZG0kkw+Un9s8W5sA6MgnGy4rfS4ZwZKGN1+4bZGRn5C5ur9zxt+Kv9O+TmEn3S5G hOp6jEAVhjXLVxdq5tN8BMUVM4+2qvCWXigNa3FKSbwhACG3bqQG0Yaq3EcEyZAHnGU8fiBSq aJX1JqC37XnZyFJbG3pWotCq7ryFEZ5x35VFBvKjEEyC1GBM of_property_match_string returns an int; either an index from 0 or greater if successful or negative on failure. Even it's very unlikely that the DT CPU node contains multiple enable-methods these checks should be fixed. This patch was inspired by the work of Nick Desaulniers. Link: https://lore.kernel.org/lkml/20230516-sunxi-v1-1-ac4b9651a8c1@google.com/T/ Cc: Nick Desaulniers Signed-off-by: Stefan Wahren Reviewed-by: Chen-Yu Tsai --- arch/arm/mach-sunxi/mc_smp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.34.1 diff --git a/arch/arm/mach-sunxi/mc_smp.c b/arch/arm/mach-sunxi/mc_smp.c index 6ec3445f3c72..277f6aa8e6c2 100644 --- a/arch/arm/mach-sunxi/mc_smp.c +++ b/arch/arm/mach-sunxi/mc_smp.c @@ -803,12 +803,12 @@ static int __init sunxi_mc_smp_init(void) for (i = 0; i < ARRAY_SIZE(sunxi_mc_smp_data); i++) { ret = of_property_match_string(node, "enable-method", sunxi_mc_smp_data[i].enable_method); - if (!ret) + if (ret >= 0) break; } of_node_put(node); - if (ret) + if (ret < 0) return -ENODEV; is_a83t = sunxi_mc_smp_data[i].is_a83t;