[PATCH] mailbox: Use of_property_match_string() instead of open-coding

[PATCH] mailbox: Use of_property_match_string() instead of open-coding

[Rob Herring (Arm)]

Use of_property_match_string() instead of open-coding the search. With
this, of_get_property() can be removed as there is no need to check for
"mbox-names" presence first.

This is part of a larger effort to remove callers of of_get_property()
and similar functions. of_get_property() leaks the DT property data
pointer which is a problem for dynamically allocated nodes which may
be freed.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
 drivers/mailbox/mailbox.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index ebff3baf3045..d3d26a2c9895 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -450,30 +450,20 @@ struct mbox_chan *mbox_request_channel_byname(struct mbox_client *cl,
 					      const char *name)
 {
 	struct device_node *np = cl->dev->of_node;
-	struct property *prop;
-	const char *mbox_name;
-	int index = 0;
+	int index;
 
 	if (!np) {
 		dev_err(cl->dev, "%s() currently only supports DT\n", __func__);
 		return ERR_PTR(-EINVAL);
 	}
 
-	if (!of_get_property(np, "mbox-names", NULL)) {
-		dev_err(cl->dev,
-			"%s() requires an \"mbox-names\" property\n", __func__);
+	index = of_property_match_string(np, "mbox-names", name);
+	if (index < 0) {
+		dev_err(cl->dev, "%s() could not locate channel named \"%s\"\n",
+			__func__, name);
 		return ERR_PTR(-EINVAL);
 	}
-
-	of_property_for_each_string(np, "mbox-names", prop, mbox_name) {
-		if (!strncmp(name, mbox_name, strlen(name)))
-			return mbox_request_channel(cl, index);
-		index++;
-	}
-
-	dev_err(cl->dev, "%s() could not locate channel named \"%s\"\n",
-		__func__, name);
-	return ERR_PTR(-EINVAL);
+	return mbox_request_channel(cl, index);
 }
 EXPORT_SYMBOL_GPL(mbox_request_channel_byname);
 
-- 
2.43.0

Re: [PATCH] mailbox: Use of_property_match_string() instead of open-coding

[Rob Herring]

On Wed, Jul 31, 2024 at 3:16 PM Rob Herring (Arm) <robh@kernel.org> wrote:
>
> Use of_property_match_string() instead of open-coding the search. With
> this, of_get_property() can be removed as there is no need to check for
> "mbox-names" presence first.
>
> This is part of a larger effort to remove callers of of_get_property()
> and similar functions. of_get_property() leaks the DT property data
> pointer which is a problem for dynamically allocated nodes which may
> be freed.
>
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> ---
>  drivers/mailbox/mailbox.c | 22 ++++++----------------
>  1 file changed, 6 insertions(+), 16 deletions(-)

Ping!

>
> diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
> index ebff3baf3045..d3d26a2c9895 100644
> --- a/drivers/mailbox/mailbox.c
> +++ b/drivers/mailbox/mailbox.c
> @@ -450,30 +450,20 @@ struct mbox_chan *mbox_request_channel_byname(struct mbox_client *cl,
>                                               const char *name)
>  {
>         struct device_node *np = cl->dev->of_node;
> -       struct property *prop;
> -       const char *mbox_name;
> -       int index = 0;
> +       int index;
>
>         if (!np) {
>                 dev_err(cl->dev, "%s() currently only supports DT\n", __func__);
>                 return ERR_PTR(-EINVAL);
>         }
>
> -       if (!of_get_property(np, "mbox-names", NULL)) {
> -               dev_err(cl->dev,
> -                       "%s() requires an \"mbox-names\" property\n", __func__);
> +       index = of_property_match_string(np, "mbox-names", name);
> +       if (index < 0) {
> +               dev_err(cl->dev, "%s() could not locate channel named \"%s\"\n",
> +                       __func__, name);
>                 return ERR_PTR(-EINVAL);
>         }
> -
> -       of_property_for_each_string(np, "mbox-names", prop, mbox_name) {
> -               if (!strncmp(name, mbox_name, strlen(name)))
> -                       return mbox_request_channel(cl, index);
> -               index++;
> -       }
> -
> -       dev_err(cl->dev, "%s() could not locate channel named \"%s\"\n",
> -               __func__, name);
> -       return ERR_PTR(-EINVAL);
> +       return mbox_request_channel(cl, index);
>  }
>  EXPORT_SYMBOL_GPL(mbox_request_channel_byname);
>
> --
> 2.43.0
>

Re: [PATCH] mailbox: Use of_property_match_string() instead of open-coding

[Jassi Brar]

On Tue, Sep 3, 2024 at 2:18 PM Rob Herring <robh@kernel.org> wrote:
>
> On Wed, Jul 31, 2024 at 3:16 PM Rob Herring (Arm) <robh@kernel.org> wrote:
> >
> > Use of_property_match_string() instead of open-coding the search. With
> > this, of_get_property() can be removed as there is no need to check for
> > "mbox-names" presence first.
> >
> > This is part of a larger effort to remove callers of of_get_property()
> > and similar functions. of_get_property() leaks the DT property data
> > pointer which is a problem for dynamically allocated nodes which may
> > be freed.
> >
> > Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> > ---
> >  drivers/mailbox/mailbox.c | 22 ++++++----------------
> >  1 file changed, 6 insertions(+), 16 deletions(-)
>
> Ping!
>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>

Re: [PATCH] mailbox: Use of_property_match_string() instead of open-coding

[Rob Herring]

On Tue, Sep 3, 2024 at 4:05 PM Jassi Brar <jassisinghbrar@gmail.com> wrote:
>
> On Tue, Sep 3, 2024 at 2:18 PM Rob Herring <robh@kernel.org> wrote:
> >
> > On Wed, Jul 31, 2024 at 3:16 PM Rob Herring (Arm) <robh@kernel.org> wrote:
> > >
> > > Use of_property_match_string() instead of open-coding the search. With
> > > this, of_get_property() can be removed as there is no need to check for
> > > "mbox-names" presence first.
> > >
> > > This is part of a larger effort to remove callers of of_get_property()
> > > and similar functions. of_get_property() leaks the DT property data
> > > pointer which is a problem for dynamically allocated nodes which may
> > > be freed.
> > >
> > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> > > ---
> > >  drivers/mailbox/mailbox.c | 22 ++++++----------------
> > >  1 file changed, 6 insertions(+), 16 deletions(-)
> >
> > Ping!
> >
> Acked-by: Jassi Brar <jassisinghbrar@gmail.com>

Don't need an ack, are you going to apply?

Rob

Re: [PATCH] mailbox: Use of_property_match_string() instead of open-coding

[Jassi Brar]

On Wed, Sep 4, 2024 at 8:20 AM Rob Herring <robh@kernel.org> wrote:
>
> On Tue, Sep 3, 2024 at 4:05 PM Jassi Brar <jassisinghbrar@gmail.com> wrote:
> >
> > On Tue, Sep 3, 2024 at 2:18 PM Rob Herring <robh@kernel.org> wrote:
> > >
> > > On Wed, Jul 31, 2024 at 3:16 PM Rob Herring (Arm) <robh@kernel.org> wrote:
> > > >
> > > > Use of_property_match_string() instead of open-coding the search. With
> > > > this, of_get_property() can be removed as there is no need to check for
> > > > "mbox-names" presence first.
> > > >
> > > > This is part of a larger effort to remove callers of of_get_property()
> > > > and similar functions. of_get_property() leaks the DT property data
> > > > pointer which is a problem for dynamically allocated nodes which may
> > > > be freed.
> > > >
> > > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> > > > ---
> > > >  drivers/mailbox/mailbox.c | 22 ++++++----------------
> > > >  1 file changed, 6 insertions(+), 16 deletions(-)
> > >
> > > Ping!
> > >
> > Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
>
> Don't need an ack, are you going to apply?
>
Yes I was and will be if you won't.

-Jassi