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

ASoC: simple-card-utils: tidyup asoc_simple_parse_convert() 



dev is not used. This patch removes it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87eefgwf8j.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/simple_card_utils.h

+1 −2
Original line number Diff line number Diff line
@@ -160,8 +160,7 @@ int asoc_simple_clean_reference(struct snd_soc_card *card); 


void asoc_simple_convert_fixup(struct asoc_simple_data *data,

				      struct snd_pcm_hw_params *params);

void asoc_simple_parse_convert(struct device *dev,

			       struct device_node *np, char *prefix,

void asoc_simple_parse_convert(struct device_node *np, char *prefix,

			       struct asoc_simple_data *data);



int asoc_simple_parse_routing(struct snd_soc_card *card,

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

+5 −5
Original line number Diff line number Diff line
@@ -180,11 +180,11 @@ static void graph_parse_convert(struct device *dev, 
	struct device_node *ports = of_get_parent(port);

	struct device_node *node = of_graph_get_port_parent(ep);



	asoc_simple_parse_convert(dev, top,   NULL,   adata);

	asoc_simple_parse_convert(dev, node,  PREFIX, adata);

	asoc_simple_parse_convert(dev, ports, NULL,   adata);

	asoc_simple_parse_convert(dev, port,  NULL,   adata);

	asoc_simple_parse_convert(dev, ep,    NULL,   adata);

	asoc_simple_parse_convert(top,   NULL,   adata);

	asoc_simple_parse_convert(node,  PREFIX, adata);

	asoc_simple_parse_convert(ports, NULL,   adata);

	asoc_simple_parse_convert(port,  NULL,   adata);

	asoc_simple_parse_convert(ep,    NULL,   adata);



	of_node_put(port);

	of_node_put(ports);

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

+1 −2
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ void asoc_simple_convert_fixup(struct asoc_simple_data *data, 
}

EXPORT_SYMBOL_GPL(asoc_simple_convert_fixup);



void asoc_simple_parse_convert(struct device *dev,

			       struct device_node *np,

void asoc_simple_parse_convert(struct device_node *np,

			       char *prefix,

			       struct asoc_simple_data *data)

{

sound/soc/generic/simple-card.c

+4 −4
Original line number Diff line number Diff line
@@ -84,10 +84,10 @@ static void simple_parse_convert(struct device *dev, 
	struct device_node *top = dev->of_node;

	struct device_node *node = of_get_parent(np);



	asoc_simple_parse_convert(dev, top,  PREFIX, adata);

	asoc_simple_parse_convert(dev, node, PREFIX, adata);

	asoc_simple_parse_convert(dev, node, NULL,   adata);

	asoc_simple_parse_convert(dev, np,   NULL,   adata);

	asoc_simple_parse_convert(top,  PREFIX, adata);

	asoc_simple_parse_convert(node, PREFIX, adata);

	asoc_simple_parse_convert(node, NULL,   adata);

	asoc_simple_parse_convert(np,   NULL,   adata);



	of_node_put(node);

}