Re: [PATCH] nvdimm: Use of_property_present() and of_property_read_bool()

From: Ira Weiny
Date: Wed Sep 04 2024 - 09:56:17 EST


Rob Herring wrote:
> On Wed, Jul 31, 2024 at 2:14 PM Rob Herring (Arm) <robh@xxxxxxxxxx> wrote:
> >
> > Use of_property_present() and of_property_read_bool() to test
> > property presence and read boolean properties rather than
> > of_(find|get)_property(). This is part of a larger effort to remove
> > callers of of_find_property() and similar functions.
> > of_(find|get)_property() leak the DT struct property and data pointers
> > which is a problem for dynamically allocated nodes which may be freed.
> >
> > Signed-off-by: Rob Herring (Arm) <robh@xxxxxxxxxx>
> > ---
> > drivers/nvdimm/of_pmem.c | 2 +-
> > drivers/nvmem/layouts.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
>
> Ping

It is soaking for 6.12.

https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git/log/?h=libnvdimm-for-next

Thanks,
Ira

>
> > diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c
> > index 403384f25ce3..b4a1cf70e8b7 100644
> > --- a/drivers/nvdimm/of_pmem.c
> > +++ b/drivers/nvdimm/of_pmem.c
> > @@ -47,7 +47,7 @@ static int of_pmem_region_probe(struct platform_device *pdev)
> > }
> > platform_set_drvdata(pdev, priv);
> >
> > - is_volatile = !!of_find_property(np, "volatile", NULL);
> > + is_volatile = of_property_read_bool(np, "volatile");
> > dev_dbg(&pdev->dev, "Registering %s regions from %pOF\n",
> > is_volatile ? "volatile" : "non-volatile", np);
> >
> > diff --git a/drivers/nvmem/layouts.c b/drivers/nvmem/layouts.c
> > index 77a4119efea8..65d39e19f6ec 100644
> > --- a/drivers/nvmem/layouts.c
> > +++ b/drivers/nvmem/layouts.c
> > @@ -123,7 +123,7 @@ static int nvmem_layout_bus_populate(struct nvmem_device *nvmem,
> > int ret;
> >
> > /* Make sure it has a compatible property */
> > - if (!of_get_property(layout_dn, "compatible", NULL)) {
> > + if (!of_property_present(layout_dn, "compatible")) {
> > pr_debug("%s() - skipping %pOF, no compatible prop\n",
> > __func__, layout_dn);
> > return 0;
> > --
> > 2.43.0
> >