2023-01-10 21:30:26

by Rafał Miłecki

Subject: [PATCH V2] nvmem: core: fix nvmem_layout_get_match_data()

From: Rafał Miłecki <[email protected]>

This function was trying to match wrong OF node (parent device's)
against an of_match_table. It was always returning NULL.

Make it match layout's OF node against layout's of_match_table.

Note: __maybe_unused is needed to avoid:
warning: variable 'layout_np' set but not used [-Wunused-but-set-variable]
(of_match_node() is no-op without CONFIG_OF).

Fixes: f5709a684a0a ("nvmem: core: introduce NVMEM layouts")
Signed-off-by: Rafał Miłecki <[email protected]>
Reviewed-by: Michael Walle <[email protected]>
---
drivers/nvmem/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index d112bb1328c1..d3be50ed2d0b 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -824,9 +824,11 @@ EXPORT_SYMBOL_GPL(of_nvmem_layout_get_container);
const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem,
struct nvmem_layout *layout)
{
+ struct device_node __maybe_unused *layout_np;
const struct of_device_id *match;

- match = of_match_node(layout->of_match_table, nvmem->dev.of_node);
+ layout_np = of_nvmem_layout_get_container(nvmem);
+ match = of_match_node(layout->of_match_table, layout_np);

return match ? match->data : NULL;
}
--
2.34.1

2023-01-20 18:28:15

by Srinivas Kandagatla

Subject: Re: [PATCH V2] nvmem: core: fix nvmem_layout_get_match_data()

On 10/01/2023 20:43, Rafał Miłecki wrote:
> From: Rafał Miłecki <[email protected]>
>
> This function was trying to match wrong OF node (parent device's)
> against an of_match_table. It was always returning NULL.
>
> Make it match layout's OF node against layout's of_match_table.
>
> Note: __maybe_unused is needed to avoid:
> warning: variable 'layout_np' set but not used [-Wunused-but-set-variable]
> (of_match_node() is no-op without CONFIG_OF).
>
> Fixes: f5709a684a0a ("nvmem: core: introduce NVMEM layouts")
> Signed-off-by: Rafał Miłecki <[email protected]>
> Reviewed-by: Michael Walle <[email protected]>

Applied thanks,

--srini
> ---
> drivers/nvmem/core.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
> index d112bb1328c1..d3be50ed2d0b 100644
> --- a/drivers/nvmem/core.c
> +++ b/drivers/nvmem/core.c
> @@ -824,9 +824,11 @@ EXPORT_SYMBOL_GPL(of_nvmem_layout_get_container);
> const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem,
> struct nvmem_layout *layout)
> {
> + struct device_node __maybe_unused *layout_np;
> const struct of_device_id *match;
>
> - match = of_match_node(layout->of_match_table, nvmem->dev.of_node);
> + layout_np = of_nvmem_layout_get_container(nvmem);
> + match = of_match_node(layout->of_match_table, layout_np);
>
> return match ? match->data : NULL;
> }