Unverified Commit 419d1918 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: simple-card-utils: use __free(device_node) for device node 



simple-card-utils handles many type of device_node, thus need to
use of_node_put() in many place. Let's use __free(device_node)
and avoid it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87r06pfre8.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5757b316

sound/soc/generic/simple-card-utils.c

+14 −30
Original line number Diff line number Diff line
@@ -1005,35 +1005,27 @@ EXPORT_SYMBOL_GPL(graph_util_card_probe); 


int graph_util_is_ports0(struct device_node *np)

{

	struct device_node *port, *ports, *ports0, *top;

	int ret;

	struct device_node *parent __free(device_node) = of_get_parent(np);

	struct device_node *port;



	/* np is "endpoint" or "port" */

	if (of_node_name_eq(np, "endpoint")) {

		port = of_get_parent(np);

	} else {

	if (of_node_name_eq(np, "endpoint"))

		port = parent;

	else

		port = np;

		of_node_get(port);

	}



	ports	= of_get_parent(port);

	top	= of_get_parent(ports);

	ports0	= of_get_child_by_name(top, "ports");



	ret = ports0 == ports;



	of_node_put(port);

	of_node_put(ports);

	of_node_put(ports0);

	of_node_put(top);

	struct device_node *ports  __free(device_node) = of_get_parent(port);

	struct device_node *top    __free(device_node) = of_get_parent(ports);

	struct device_node *ports0 __free(device_node) = of_get_child_by_name(top, "ports");



	return ret;

	return ports0 == ports;

}

EXPORT_SYMBOL_GPL(graph_util_is_ports0);



static int graph_get_dai_id(struct device_node *ep)

{

	struct device_node *node;

	struct device_node *node __free(device_node) = of_graph_get_port_parent(ep);

	struct device_node *port __free(device_node) = of_get_parent(ep);

	struct device_node *endpoint;

	struct of_endpoint info;

	int i, id;
@@ -1056,13 +1048,10 @@ static int graph_get_dai_id(struct device_node *ep) 
		if (of_property_present(ep,   "reg"))

			return info.id;



		node = of_get_parent(ep);

		ret = of_property_present(node, "reg");

		of_node_put(node);

		ret = of_property_present(port, "reg");

		if (ret)

			return info.port;

	}

	node = of_graph_get_port_parent(ep);



	/*

	 * Non HDMI sound case, counting port/endpoint on its DT
@@ -1076,8 +1065,6 @@ static int graph_get_dai_id(struct device_node *ep) 
		i++;

	}



	of_node_put(node);



	if (id < 0)

		return -ENODEV;
@@ -1087,7 +1074,6 @@ static int graph_get_dai_id(struct device_node *ep) 
int graph_util_parse_dai(struct device *dev, struct device_node *ep,

			 struct snd_soc_dai_link_component *dlc, int *is_single_link)

{

	struct device_node *node;

	struct of_phandle_args args = {};

	struct snd_soc_dai *dai;

	int ret;
@@ -1095,7 +1081,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, 
	if (!ep)

		return 0;



	node = of_graph_get_port_parent(ep);

	struct device_node *node __free(device_node) = of_graph_get_port_parent(ep);



	/*

	 * Try to find from DAI node
@@ -1136,10 +1122,8 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, 
	 *    if he unbinded CPU or Codec.

	 */

	ret = snd_soc_get_dlc(&args, dlc);

	if (ret < 0) {

		of_node_put(node);

	if (ret < 0)

		return ret;

	}



parse_dai_end:

	if (is_single_link)