Commit 263dbd3c authored by Rob Herring (Arm)'s avatar Rob Herring (Arm) Committed by Jassi Brar
Browse files

mailbox: Use of_property_match_string() instead of open-coding 



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: default avatarRob Herring (Arm) <robh@kernel.org>
Signed-off-by: default avatarJassi Brar <jassisinghbrar@gmail.com>
parent dc09f007

drivers/mailbox/mailbox.c

+6 −16
Original line number Diff line number Diff line
@@ -450,31 +450,21 @@ 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__);

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

	}



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

	}

	return mbox_request_channel(cl, index);

}

EXPORT_SYMBOL_GPL(mbox_request_channel_byname);



/**