Unverified Commit 84c9601a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: audio-graph-card: remove ports node name check 



Current audio-graph-card is checking if the node name was "ports" or
not when parsing the property.

	if (of_node_name_eq(ports, "ports"))
		of_xxx(ports, ...);

Now, it is using new port_to_ports() which will be NULL if the node
doesn't have "ports", and each of_xxx functions will do nothing if
node was NULL.
Now we don't need to check ports node name. Let's remove and cleanup it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://msgid.link/r/871q5mh6fv.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/generic/audio-graph-card.c

+5 −10
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ static void graph_parse_convert(struct device *dev, 
	struct device_node *node = of_graph_get_port_parent(ep);



	simple_util_parse_convert(top,   NULL,   adata);

	if (of_node_name_eq(ports, "ports"))

	simple_util_parse_convert(ports, NULL,   adata);

	simple_util_parse_convert(port,  NULL,   adata);

	simple_util_parse_convert(ep,    NULL,   adata);
@@ -103,7 +102,6 @@ static void graph_parse_mclk_fs(struct device_node *top, 
	struct device_node *ports	= port_to_ports(port);



	of_property_read_u32(top,	"mclk-fs", &props->mclk_fs);

	if (of_node_name_eq(ports, "ports"))

	of_property_read_u32(ports,	"mclk-fs", &props->mclk_fs);

	of_property_read_u32(port,	"mclk-fs", &props->mclk_fs);

	of_property_read_u32(ep,	"mclk-fs", &props->mclk_fs);
@@ -245,12 +243,9 @@ static int graph_dai_link_of_dpcm(struct simple_util_priv *priv, 
		/* check "prefix" from top node */

		port  = ep_to_port(ep);

		ports = port_to_ports(port);

		snd_soc_of_parse_node_prefix(top, cconf, codecs->of_node,

					      "prefix");

		if (of_node_name_eq(ports, "ports"))

		snd_soc_of_parse_node_prefix(top,   cconf, codecs->of_node, "prefix");

		snd_soc_of_parse_node_prefix(ports, cconf, codecs->of_node, "prefix");

		snd_soc_of_parse_node_prefix(port, cconf, codecs->of_node,

					     "prefix");

		snd_soc_of_parse_node_prefix(port,  cconf, codecs->of_node, "prefix");



		of_node_put(ports);

		of_node_put(port);