diff mbox series

of: property: fix #nvmem-cell-cells parsing

Message ID	20230110233056.3490942-1-michael@walle.cc
State	New
Headers	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; From: Michael Walle <michael@walle.cc> To: Rob Herring <robh+dt@kernel.org>, Frank Rowand <frowand.list@gmail.com>, Srinivas Kandagatla <srinivas.kandagatla@linaro.org>, Robert Marko <robimarko@gmail.com>, Alexander Stein <alexander.stein@ew.tq-group.com>, Peng Fan <peng.fan@nxp.com>, Miquel Raynal <miquel.raynal@bootlin.com> Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Aisheng Dong <aisheng.dong@nxp.com>, Michael Walle <michael@walle.cc> 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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	of: property: fix #nvmem-cell-cells parsing \| of: property: fix #nvmem-cell-cells parsing

Commit Message

Michael Walle Jan. 10, 2023, 11:30 p.m. UTC

  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 <peng.fan@nxp.com>
Signed-off-by: Michael Walle <michael@walle.cc>
Tested-by: Robert Marko <robimarko@gmail.com>
---
 drivers/of/property.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Peng Fan Jan. 11, 2023, 2:45 a.m. UTC | #1

> Subject: [PATCH] of: property: fix #nvmem-cell-cells parsing
> 
> 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 <peng.fan@nxp.com>
> Signed-off-by: Michael Walle <michael@walle.cc>
> Tested-by: Robert Marko <robimarko@gmail.com>

Tested-by: Peng Fan <peng.fan@nxp.com>

> ---
>  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;
> --
> 2.30.2

Rob Herring Jan. 13, 2023, 1:32 a.m. UTC | #2

On Wed, 11 Jan 2023 00:30:56 +0100, Michael Walle wrote:
> 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 <peng.fan@nxp.com>
> Signed-off-by: Michael Walle <michael@walle.cc>
> Tested-by: Robert Marko <robimarko@gmail.com>
> ---
>  drivers/of/property.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 

Applied, thanks!

Rob Herring Jan. 13, 2023, 1:33 a.m. UTC | #3

On Thu, Jan 12, 2023 at 7:32 PM Rob Herring <robh@kernel.org> wrote:
>
>
> On Wed, 11 Jan 2023 00:30:56 +0100, Michael Walle wrote:
> > 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 <peng.fan@nxp.com>
> > Signed-off-by: Michael Walle <michael@walle.cc>
> > Tested-by: Robert Marko <robimarko@gmail.com>
> > ---
> >  drivers/of/property.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
>
> Applied, thanks!

Or not. 67b8497f005f is not in my tree, so

Acked-by: Rob Herring <robh@kernel.org>

Michael Walle Jan. 13, 2023, 10:20 a.m. UTC | #4

>> > 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 <peng.fan@nxp.com>
>> > Signed-off-by: Michael Walle <michael@walle.cc>
>> > Tested-by: Robert Marko <robimarko@gmail.com>
>> > ---
>> >  drivers/of/property.c | 8 ++++----
>> >  1 file changed, 4 insertions(+), 4 deletions(-)
>> >
>> 
>> Applied, thanks!
> 
> Or not. 67b8497f005f is not in my tree, so
> 
> Acked-by: Rob Herring <robh@kernel.org>

Thanks! Srinivas, can you pick it up to get rid of the errors/warnings
in linux-next?

-michael

Srinivas Kandagatla Jan. 20, 2023, 5:48 p.m. UTC | #5

On 10/01/2023 23:30, Michael Walle wrote:
> 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 <peng.fan@nxp.com>
> Signed-off-by: Michael Walle <michael@walle.cc>
> Tested-by: Robert Marko <robimarko@gmail.com>
> ---

Applied thanks,

--srini
>   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;

diff mbox series

Patch

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;