Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e166382 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: simple-card-utils: share same dev_dbg() for sysclk 



Let's share same debug message for sysclk

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4579771e

include/sound/simple_card_utils.h

+6 −3
Original line number Diff line number Diff line
@@ -35,13 +35,16 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card, 
				     char *prefix);



#define asoc_simple_card_parse_clk_cpu(dev, node, dai_link, simple_dai)		\

	asoc_simple_card_parse_clk(dev, node, dai_link->cpu_of_node, simple_dai)

	asoc_simple_card_parse_clk(dev, node, dai_link->cpu_of_node, simple_dai, \

				   dai_link->cpu_dai_name)

#define asoc_simple_card_parse_clk_codec(dev, node, dai_link, simple_dai)	\

	asoc_simple_card_parse_clk(dev, node, dai_link->codec_of_node, simple_dai)

	asoc_simple_card_parse_clk(dev, node, dai_link->codec_of_node, simple_dai,\

				   dai_link->codec_dai_name)

int asoc_simple_card_parse_clk(struct device *dev,

			       struct device_node *node,

			       struct device_node *dai_of_node,

			       struct asoc_simple_dai *simple_dai);

			       struct asoc_simple_dai *simple_dai,

			       const char *name);



#define asoc_simple_card_parse_cpu(node, dai_link,				\

				   list_name, cells_name, is_single_link)	\

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

+0 −7
Original line number Diff line number Diff line
@@ -169,13 +169,6 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_port, 
	dai_link->ops = &asoc_graph_card_ops;

	dai_link->init = asoc_graph_card_dai_init;



	dev_dbg(dev, "\tcpu : %s / %d\n",

		dai_link->cpu_dai_name,

		cpu_dai->sysclk);

	dev_dbg(dev, "\tcodec : %s / %d\n",

		dai_link->codec_dai_name,

		codec_dai->sysclk);



	asoc_simple_card_canonicalize_cpu(dai_link,

					  card->num_links == 1);

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

+0 −5
Original line number Diff line number Diff line
@@ -185,11 +185,6 @@ static int asoc_graph_card_dai_link_of(struct device_node *ep, 
	dai_link->ops			= &asoc_graph_card_ops;

	dai_link->init			= asoc_graph_card_dai_init;



	dev_dbg(dev, "\t%s / %04x / %d\n",

		dai_link->name,

		dai_link->dai_fmt,

		dai_props->sysclk);



	return 0;

}

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

+4 −1
Original line number Diff line number Diff line
@@ -113,7 +113,8 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_name); 
int asoc_simple_card_parse_clk(struct device *dev,

			       struct device_node *node,

			       struct device_node *dai_of_node,

			       struct asoc_simple_dai *simple_dai)

			       struct asoc_simple_dai *simple_dai,

			       const char *name)

{

	struct clk *clk;

	u32 val;
@@ -136,6 +137,8 @@ int asoc_simple_card_parse_clk(struct device *dev, 
			simple_dai->sysclk = clk_get_rate(clk);

	}



	dev_dbg(dev, "%s : sysclk = %d\n", name, simple_dai->sysclk);



	return 0;

}

EXPORT_SYMBOL_GPL(asoc_simple_card_parse_clk);

sound/soc/generic/simple-card.c

+0 −7
Original line number Diff line number Diff line
@@ -301,13 +301,6 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, 
	dai_link->ops = &asoc_simple_card_ops;

	dai_link->init = asoc_simple_card_dai_init;



	dev_dbg(dev, "\tcpu : %s / %d\n",

		dai_link->cpu_dai_name,

		dai_props->cpu_dai.sysclk);

	dev_dbg(dev, "\tcodec : %s / %d\n",

		dai_link->codec_dai_name,

		dai_props->codec_dai.sysclk);



	asoc_simple_card_canonicalize_cpu(dai_link, single_cpu);



dai_link_of_err: