2023-01-11 00:16:06

by Michael Walle

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 <[email protected]>
Signed-off-by: Michael Walle <[email protected]>
Tested-by: Robert Marko <[email protected]>
---
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

2023-01-11 03:09:20

by Peng Fan

Subject: RE: [PATCH] of: property: fix #nvmem-cell-cells parsing

> 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 <[email protected]>
> Signed-off-by: Michael Walle <[email protected]>
> Tested-by: Robert Marko <[email protected]>

Tested-by: Peng Fan <[email protected]>

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

2023-01-13 02:05:00

by Rob Herring (Arm)

Subject: Re: [PATCH] of: property: fix #nvmem-cell-cells parsing

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 <[email protected]>
> Signed-off-by: Michael Walle <[email protected]>
> Tested-by: Robert Marko <[email protected]>
> ---
> drivers/of/property.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>

Applied, thanks!

2023-01-13 02:10:50

by Rob Herring

Subject: Re: [PATCH] of: property: fix #nvmem-cell-cells parsing

On Thu, Jan 12, 2023 at 7:32 PM Rob Herring <[email protected]> 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 <[email protected]>
> > Signed-off-by: Michael Walle <[email protected]>
> > Tested-by: Robert Marko <[email protected]>
> > ---
> > 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 <[email protected]>

2023-01-13 10:27:50

by Michael Walle

Subject: Re: [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 <[email protected]>
>> > Signed-off-by: Michael Walle <[email protected]>
>> > Tested-by: Robert Marko <[email protected]>
>> > ---
>> > 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 <[email protected]>

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

-michael

2023-01-20 18:35:51

by Srinivas Kandagatla

Subject: Re: [PATCH] of: property: fix #nvmem-cell-cells parsing

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 <[email protected]>
> Signed-off-by: Michael Walle <[email protected]>
> Tested-by: Robert Marko <[email protected]>
> ---

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;