From mboxrd@z Thu Jan 1 00:00:00 1970 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.subspace.kernel.org (Postfix) with ESMTPS id 6320018EBF; Wed, 17 Jul 2024 23:33:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721259217; cv=none; b=fRfYZUcdXXi0t3lLUdiTUHeWEDlggNi7Hj14pp00RH70U4Cd13AvA3dHS3EZVN4HvEPG9U0KvVKkYAPfw7nABuESTbU1pu60TjkhvnStESUqh3bRwvuIFRBCbIXJ61Hcu+uHQbConDKW4gS4qdMrhNxpp19mbIWwBlUJOvptN/k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721259217; c=relaxed/simple; bh=/vntp9yziGCzvLchAgMHXkRgHgytqWIKu6wEIUPrxlQ=; h=Message-ID:Content-Type:MIME-Version:In-Reply-To:References: Subject:From:Cc:To:Date; b=I50lv1Kqj5NSMeWUI/RxfLgvaOT/bjzYxs5YFYqh5viv3r2OTB0xp2uxNR1QGTFPnQh/1nkp4ZMZ274iyQ2DzsJFbhzO+AKWXPUp2/irJIIEtZEbnImKhbuiObOlztCb55V1E6FhPbXGWxuJpcQJwRpVpaKf+l0ldX9EKoG8K/4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=m/tYahsI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="m/tYahsI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A59E2C2BD10; Wed, 17 Jul 2024 23:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721259216; bh=/vntp9yziGCzvLchAgMHXkRgHgytqWIKu6wEIUPrxlQ=; h=In-Reply-To:References:Subject:From:Cc:To:Date:From; b=m/tYahsI7GcAsn0eTT4WF3W3BC90QDmQbipyzN62A8EQrxsGjJuDHvLvxJTe9ClPb SxfN7qFIZCngz7gztSRBpz2eEzrUCy4jUV1ydb6l65kKp+wAq1QWNBsZy5KABTYVQR tq+sCrNewY9i6SpEr8eZIOLHRCKt7Ey7NF7M1f0KLVQ+ZcrJeHrDZjeNPd1EsmFr+5 4zTlnoxdZoC9fCxuCKnodh5r8fGggVstFE9nygPb3O0rvXh68bBkRq/sZ9W1kFT6Vp PNOejeGFpQtHdc4Q11bbXLpU6fBG4A6iIgpFlB92tbnMPPxy5xVe6T52lr0cg39ZBV sbhS/c+mN45rg== Message-ID: <1e36b1ba8af3584128550822a70cb072.sboyd@kernel.org> Content-Type: text/plain; charset="utf-8" Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable In-Reply-To: <20240717-of_property_for_each_u32-v2-1-4060990f49c9@bootlin.com> References: <20240717-of_property_for_each_u32-v2-1-4060990f49c9@bootlin.com> Subject: Re: [PATCH v2] of: remove internal arguments from of_property_for_each_u32() From: Stephen Boyd Cc: Peng Fan (OSS) , Thomas Petazzoni , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, llvm@lists.linux.dev, linux-clk@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-samsung-soc@vger.kernel.org, linux-gpio@vger.kernel.org, linux-iio@vger.kernel.org, linux-pwm@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, patches@opensource.cirrus.com, linux-sound@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, Luca Ceresoli , Andre Przywara , Bartosz Golaszewski , Jonathan Cameron , Uwe =?utf-8?q?Kleine-K=C3=B6nig?= , Richard Fitzgerald To: Aaro Koskinen , Alexandre Belloni , Alim Akhtar , Andreas Kemnade , Bartosz Golaszewski , Bjorn Andersson , Broadcom internal kernel review list , Chen-Yu Tsai , Chester Lin , Christophe Leroy , Claudiu Beznea , Damien Le Moal , Daniel Lezcano , Dong Aisheng , Doug Berger , Emilio =?utf-8?q?L=C3=B3pez?= , Fabio Estevam , Florian Fainelli , Ghennadi Procopciuc , Greg Kroah-Hartman , Jacky Bai , Jaroslav Kysela , Jernej Skrabec , Jiri Slaby , Jonathan Cameron , Kevin Hilman , Krzysztof Kozlowski , Lars-Peter Clausen , Lee Jones , Liam Girdwood , Linus Walleij , Luca Ceresoli , Mark Brown , Matthias Brugger , Michael Ellerman , Michael Turquette , Miguel Ojeda , Nathan Chancellor , Naveen N. Rao , Nicholas Piggin , Nicolas Ferre , Pengutronix Kernel Team , Richard Leitner , Rob Herring , Roger Quadros , Samuel Holland , Saravana Kannan , Shawn Guo , Takashi Iwai , Thomas Gleixner , Tony Lindgren , Uwe =?utf-8?q?Kleine-K=C3=B6nig?= Date: Wed, 17 Jul 2024 16:33:34 -0700 User-Agent: alot/0.10 Quoting Luca Ceresoli (2024-07-17 09:16:32) > diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c > index 4ce83c5265b8..d4904f59f83f 100644 > --- a/drivers/clk/clk-si5351.c > +++ b/drivers/clk/clk-si5351.c > @@ -1175,8 +1175,8 @@ static int si5351_dt_parse(struct i2c_client *clien= t, > { > struct device_node *child, *np =3D client->dev.of_node; > struct si5351_platform_data *pdata; > - struct property *prop; > - const __be32 *p; > + u32 array[4]; > + int sz, i; > int num =3D 0; > u32 val; > =20 > @@ -1191,20 +1191,24 @@ static int si5351_dt_parse(struct i2c_client *cli= ent, > * property silabs,pll-source : , [<..>] > * allow to selectively set pll source > */ > - of_property_for_each_u32(np, "silabs,pll-source", prop, p, num) { > + sz =3D of_property_read_variable_u32_array(np, "silabs,pll-source= ", array, 2, 4); > + sz =3D (sz =3D=3D -EINVAL) ? 0 : sz; /* Missing property is OK */ > + if (sz < 0) > + return dev_err_probe(&client->dev, sz, "invalid pll-sourc= e"); Needs a newline on the printk message. > + if (sz % 2) > + return dev_err_probe(&client->dev, -EINVAL, > + "missing pll-source for pll %d\n", a= rray[sz - 1]); > + > + for (i =3D 0; i < sz; i +=3D 2) { > + num =3D array[i]; > + val =3D array[i + 1]; > + > if (num >=3D 2) { > dev_err(&client->dev, > "invalid pll %d on pll-source prop\n", nu= m); > return -EINVAL; > } > =20 > - p =3D of_prop_next_u32(prop, p, &val); > - if (!p) { > - dev_err(&client->dev, > - "missing pll-source for pll %d\n", num); > - return -EINVAL; > - } > - > switch (val) { > case 0: > pdata->pll_src[num] =3D SI5351_PLL_SRC_XTAL; > @@ -1232,19 +1236,24 @@ static int si5351_dt_parse(struct i2c_client *cli= ent, > pdata->pll_reset[0] =3D true; > pdata->pll_reset[1] =3D true; > =20 > - of_property_for_each_u32(np, "silabs,pll-reset-mode", prop, p, nu= m) { > + sz =3D of_property_read_variable_u32_array(np, "silabs,pll-reset-= mode", array, 2, 4); > + sz =3D (sz =3D=3D -EINVAL) ? 0 : sz; /* Missing property is OK */ > + if (sz < 0) > + return dev_err_probe(&client->dev, sz, "invalid pll-reset= -mode"); Needs a newline on the printk message. > + if (sz % 2) > + return dev_err_probe(&client->dev, -EINVAL, > + "missing pll-reset-mode for pll %d\n= ", array[sz - 1]); > + With those fixed Acked-by: Stephen Boyd # clk From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 68751C3DA60 for ; Wed, 17 Jul 2024 23:33:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Date:To:Cc:From:Subject:References: In-Reply-To:MIME-Version:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=snydDX7MD6EuBZzVPhB3OaEH3u/kIaethdvsQY9rvbM=; b=Au4bxjYAxkQj0k UWgl2i0DIHkp4oTfOYWaBADi1dP5zdEwWkoFFmOINRtDWNnHTN80awnFGi6l83Rwz8dI5+o9aoUn6 OnvnZMGD0wASibR8oOIKVZTGCniyZ7VCXLttavFL9s/PnTIIeSLHlZPjvOQng6/S4eNU+Y4/F0zys cm3rx7G3/bl8Ad31UGIydX62jxF09FWi9eMK0G0KYba+pgGHhBxACfJBI/ac4zxAGO7DbXJ/FP7+S RL6XzmtR++Rr3H/N9Oo2wdBV6dnwacYUkVil8rBXxgyllbC5MeiLGSx6Oe3rVph7PIxKUiaBZsqgP otKbdwVB8MtntuTLONnQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sUE9X-0000000FCTa-0Nkk; Wed, 17 Jul 2024 23:33:43 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sUE9S-0000000FCSw-2gRw; Wed, 17 Jul 2024 23:33:40 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 3527261976; Wed, 17 Jul 2024 23:33:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A59E2C2BD10; Wed, 17 Jul 2024 23:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721259216; bh=/vntp9yziGCzvLchAgMHXkRgHgytqWIKu6wEIUPrxlQ=; h=In-Reply-To:References:Subject:From:Cc:To:Date:From; b=m/tYahsI7GcAsn0eTT4WF3W3BC90QDmQbipyzN62A8EQrxsGjJuDHvLvxJTe9ClPb SxfN7qFIZCngz7gztSRBpz2eEzrUCy4jUV1ydb6l65kKp+wAq1QWNBsZy5KABTYVQR tq+sCrNewY9i6SpEr8eZIOLHRCKt7Ey7NF7M1f0KLVQ+ZcrJeHrDZjeNPd1EsmFr+5 4zTlnoxdZoC9fCxuCKnodh5r8fGggVstFE9nygPb3O0rvXh68bBkRq/sZ9W1kFT6Vp PNOejeGFpQtHdc4Q11bbXLpU6fBG4A6iIgpFlB92tbnMPPxy5xVe6T52lr0cg39ZBV sbhS/c+mN45rg== Message-ID: <1e36b1ba8af3584128550822a70cb072.sboyd@kernel.org> MIME-Version: 1.0 In-Reply-To: <20240717-of_property_for_each_u32-v2-1-4060990f49c9@bootlin.com> References: <20240717-of_property_for_each_u32-v2-1-4060990f49c9@bootlin.com> Subject: Re: [PATCH v2] of: remove internal arguments from of_property_for_each_u32() From: Stephen Boyd Cc: Peng Fan (OSS) , Thomas Petazzoni , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, llvm@lists.linux.dev, linux-clk@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-samsung-soc@vger.kernel.org, linux-gpio@vger.kernel.org, linux-iio@vger.kernel.org, linux-pwm@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, patches@opensource.cirrus.com, linux-sound@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, Luca Ceresoli , Andre Przywara , Bartosz Golaszewski , Jonathan Cameron , Uwe =?utf-8?q?Kleine-K=C3=B6nig?= , Richard Fitzgerald To: Aaro Koskinen , Alexandre Belloni , Alim Akhtar , Andreas Kemnade , Bartosz Golaszewski , Bjorn Andersson , Broadcom internal kernel review list , Chen-Yu Tsai , Chester Lin , Christophe Leroy , Claudiu Beznea , Damien Le Moal , Daniel Lezcano , Dong Aisheng , Doug Berger , Emilio =?utf-8?q?L=C3=B3pez?= , Fabio Estevam , Florian Fainelli , Ghennadi Procopciuc , Greg Kroah-Hartman , Jacky Bai , Jaroslav Kysela , Jernej Skrabec , Jiri Slaby , Jonathan Cameron , Kevin Hilman , Krzysztof Kozlowski , Lars-Peter Clausen , Lee Jones , Liam Girdwood , Linus Walleij , Luca Ceresoli , Mark Brown , Matthias Brugger , Michael Ellerman , Michael Turquette , Miguel Ojeda , Nathan Chancellor , Naveen N. Rao , Nicholas Piggin , Nicolas Ferre , Pengutronix Kernel Team , Richard Leitner , Rob Herring , Roger Quadros , Samuel Holland , Saravana Kannan , Shawn Guo , Takashi Iwai , Thomas Gleixner , Tony Lindgren , Uwe =?utf-8?q?Kleine-K=C3=B6nig?= Date: Wed, 17 Jul 2024 16:33:34 -0700 User-Agent: alot/0.10 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240717_163338_787073_50670111 X-CRM114-Status: GOOD ( 16.46 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Quoting Luca Ceresoli (2024-07-17 09:16:32) > diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c > index 4ce83c5265b8..d4904f59f83f 100644 > --- a/drivers/clk/clk-si5351.c > +++ b/drivers/clk/clk-si5351.c > @@ -1175,8 +1175,8 @@ static int si5351_dt_parse(struct i2c_client *client, > { > struct device_node *child, *np = client->dev.of_node; > struct si5351_platform_data *pdata; > - struct property *prop; > - const __be32 *p; > + u32 array[4]; > + int sz, i; > int num = 0; > u32 val; > > @@ -1191,20 +1191,24 @@ static int si5351_dt_parse(struct i2c_client *client, > * property silabs,pll-source : , [<..>] > * allow to selectively set pll source > */ > - of_property_for_each_u32(np, "silabs,pll-source", prop, p, num) { > + sz = of_property_read_variable_u32_array(np, "silabs,pll-source", array, 2, 4); > + sz = (sz == -EINVAL) ? 0 : sz; /* Missing property is OK */ > + if (sz < 0) > + return dev_err_probe(&client->dev, sz, "invalid pll-source"); Needs a newline on the printk message. > + if (sz % 2) > + return dev_err_probe(&client->dev, -EINVAL, > + "missing pll-source for pll %d\n", array[sz - 1]); > + > + for (i = 0; i < sz; i += 2) { > + num = array[i]; > + val = array[i + 1]; > + > if (num >= 2) { > dev_err(&client->dev, > "invalid pll %d on pll-source prop\n", num); > return -EINVAL; > } > > - p = of_prop_next_u32(prop, p, &val); > - if (!p) { > - dev_err(&client->dev, > - "missing pll-source for pll %d\n", num); > - return -EINVAL; > - } > - > switch (val) { > case 0: > pdata->pll_src[num] = SI5351_PLL_SRC_XTAL; > @@ -1232,19 +1236,24 @@ static int si5351_dt_parse(struct i2c_client *client, > pdata->pll_reset[0] = true; > pdata->pll_reset[1] = true; > > - of_property_for_each_u32(np, "silabs,pll-reset-mode", prop, p, num) { > + sz = of_property_read_variable_u32_array(np, "silabs,pll-reset-mode", array, 2, 4); > + sz = (sz == -EINVAL) ? 0 : sz; /* Missing property is OK */ > + if (sz < 0) > + return dev_err_probe(&client->dev, sz, "invalid pll-reset-mode"); Needs a newline on the printk message. > + if (sz % 2) > + return dev_err_probe(&client->dev, -EINVAL, > + "missing pll-reset-mode for pll %d\n", array[sz - 1]); > + With those fixed Acked-by: Stephen Boyd # clk _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv From mboxrd@z Thu Jan 1 00:00:00 1970 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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 67D8CC3DA60 for ; Wed, 17 Jul 2024 23:40:30 +0000 (UTC) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=m/tYahsI; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4WPXVh71MFz3cYw for ; Thu, 18 Jul 2024 09:40:28 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=m/tYahsI; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=139.178.84.217; helo=dfw.source.kernel.org; envelope-from=sboyd@kernel.org; receiver=lists.ozlabs.org) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (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 lists.ozlabs.org (Postfix) with ESMTPS id 4WPXLr1KHdz30Vk for ; Thu, 18 Jul 2024 09:33:40 +1000 (AEST) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 3527261976; Wed, 17 Jul 2024 23:33:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A59E2C2BD10; Wed, 17 Jul 2024 23:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721259216; bh=/vntp9yziGCzvLchAgMHXkRgHgytqWIKu6wEIUPrxlQ=; h=In-Reply-To:References:Subject:From:Cc:To:Date:From; b=m/tYahsI7GcAsn0eTT4WF3W3BC90QDmQbipyzN62A8EQrxsGjJuDHvLvxJTe9ClPb SxfN7qFIZCngz7gztSRBpz2eEzrUCy4jUV1ydb6l65kKp+wAq1QWNBsZy5KABTYVQR tq+sCrNewY9i6SpEr8eZIOLHRCKt7Ey7NF7M1f0KLVQ+ZcrJeHrDZjeNPd1EsmFr+5 4zTlnoxdZoC9fCxuCKnodh5r8fGggVstFE9nygPb3O0rvXh68bBkRq/sZ9W1kFT6Vp PNOejeGFpQtHdc4Q11bbXLpU6fBG4A6iIgpFlB92tbnMPPxy5xVe6T52lr0cg39ZBV sbhS/c+mN45rg== Message-ID: <1e36b1ba8af3584128550822a70cb072.sboyd@kernel.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable In-Reply-To: <20240717-of_property_for_each_u32-v2-1-4060990f49c9@bootlin.com> References: <20240717-of_property_for_each_u32-v2-1-4060990f49c9@bootlin.com> Subject: Re: [PATCH v2] of: remove internal arguments from of_property_for_each_u32() From: Stephen Boyd To: Aaro Koskinen , Alexandre Belloni , Alim Akhtar , Andreas Kemnade , Bartosz Golaszewski , Bjorn Andersson , Broadcom internal kernel review list , Chen-Yu Tsai , Chester Lin , Christophe Leroy , Claudiu Beznea , Damien Le Moal , Daniel Lezcano , Dong Aisheng , Doug Berger , Emilio =?utf-8?q?L=C3=B3pez?= , Fabio Estevam , Florian Fainelli , Ghennadi Procopciuc , Greg Kroah-Hartman , Jacky Bai , Jaroslav Kysela , Jernej Skrabec , Jiri Slaby , Jonathan Cameron , Kevin Hilman , Krzysztof Kozlowski , Lars-Peter Clausen , Lee Jones , Liam Girdwood , Linus Walleij , Luca Ceresoli , Mark Brown , Matthias Brugger , Michael Ellerman , Michael Turquette , Miguel Ojeda , Nathan Chancellor , Naveen N. Rao , Nicholas Piggin , Nicolas Ferre , Pengutronix Kernel Team , Richard Leitner , Rob Herring , Roger Quadros , Samuel Holland , Saravana Kannan , Shawn Guo , Takashi Iwai , Thomas Gleixner , Tony Lindgren , Uwe =?utf-8?q?Kleine-K=C3=B6nig?= Date: Wed, 17 Jul 2024 16:33:34 -0700 User-Agent: alot/0.10 X-Mailman-Approved-At: Thu, 18 Jul 2024 09:39:49 +1000 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-pwm@vger.kernel.org, linux-iio@vger.kernel.org, llvm@lists.linux.dev, Thomas Petazzoni , linux-riscv@lists.infradead.org, linux-clk@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Bartosz Golaszewski , linux-serial@vger.kernel.org, Andre Przywara , Luca Ceresoli , linux-sunxi@lists.linux.dev, devicetree@vger.kernel.org, "Peng Fan \(OSS\)" , linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, linux-gpio@vger.kernel.org, Richard Fitzgerald , Uwe =?utf-8?q?Kleine-K=C3=B6nig?= , Jonathan Cameron , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, patches@opensource.cirrus.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Quoting Luca Ceresoli (2024-07-17 09:16:32) > diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c > index 4ce83c5265b8..d4904f59f83f 100644 > --- a/drivers/clk/clk-si5351.c > +++ b/drivers/clk/clk-si5351.c > @@ -1175,8 +1175,8 @@ static int si5351_dt_parse(struct i2c_client *clien= t, > { > struct device_node *child, *np =3D client->dev.of_node; > struct si5351_platform_data *pdata; > - struct property *prop; > - const __be32 *p; > + u32 array[4]; > + int sz, i; > int num =3D 0; > u32 val; > =20 > @@ -1191,20 +1191,24 @@ static int si5351_dt_parse(struct i2c_client *cli= ent, > * property silabs,pll-source : , [<..>] > * allow to selectively set pll source > */ > - of_property_for_each_u32(np, "silabs,pll-source", prop, p, num) { > + sz =3D of_property_read_variable_u32_array(np, "silabs,pll-source= ", array, 2, 4); > + sz =3D (sz =3D=3D -EINVAL) ? 0 : sz; /* Missing property is OK */ > + if (sz < 0) > + return dev_err_probe(&client->dev, sz, "invalid pll-sourc= e"); Needs a newline on the printk message. > + if (sz % 2) > + return dev_err_probe(&client->dev, -EINVAL, > + "missing pll-source for pll %d\n", a= rray[sz - 1]); > + > + for (i =3D 0; i < sz; i +=3D 2) { > + num =3D array[i]; > + val =3D array[i + 1]; > + > if (num >=3D 2) { > dev_err(&client->dev, > "invalid pll %d on pll-source prop\n", nu= m); > return -EINVAL; > } > =20 > - p =3D of_prop_next_u32(prop, p, &val); > - if (!p) { > - dev_err(&client->dev, > - "missing pll-source for pll %d\n", num); > - return -EINVAL; > - } > - > switch (val) { > case 0: > pdata->pll_src[num] =3D SI5351_PLL_SRC_XTAL; > @@ -1232,19 +1236,24 @@ static int si5351_dt_parse(struct i2c_client *cli= ent, > pdata->pll_reset[0] =3D true; > pdata->pll_reset[1] =3D true; > =20 > - of_property_for_each_u32(np, "silabs,pll-reset-mode", prop, p, nu= m) { > + sz =3D of_property_read_variable_u32_array(np, "silabs,pll-reset-= mode", array, 2, 4); > + sz =3D (sz =3D=3D -EINVAL) ? 0 : sz; /* Missing property is OK */ > + if (sz < 0) > + return dev_err_probe(&client->dev, sz, "invalid pll-reset= -mode"); Needs a newline on the printk message. > + if (sz % 2) > + return dev_err_probe(&client->dev, -EINVAL, > + "missing pll-reset-mode for pll %d\n= ", array[sz - 1]); > + With those fixed Acked-by: Stephen Boyd # clk