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

ASoC: simple-card-utils: share asoc_simple_dai_init() 



The difference between simple-card / audio-graph are just using
OF graph style, or not. In other words, other things should be same.
This means, simple-card/audio-graph common functions should be
implemented at simple-card-utils, and its own functions should be
implemented at each files.

Current simple-card / audio-graph have almost same functions.
This patch shares asoc_simple_dai_init() between in these 2 drivers.

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

include/sound/simple_card_utils.h

+1 −3
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ int asoc_simple_startup(struct snd_pcm_substream *substream); 
void asoc_simple_shutdown(struct snd_pcm_substream *substream);

int asoc_simple_hw_params(struct snd_pcm_substream *substream,

			  struct snd_pcm_hw_params *params);

int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd);



#define asoc_simple_card_parse_cpu(node, dai_link,				\

				   list_name, cells_name, is_single_link)	\
@@ -130,9 +131,6 @@ int asoc_simple_card_parse_graph_dai(struct device_node *ep, 
					&(dai)->slots,		\

					&(dai)->slot_width);



int asoc_simple_card_init_dai(struct snd_soc_dai *dai,

			      struct asoc_simple_dai *simple_dai);



void asoc_simple_card_canonicalize_platform(struct snd_soc_dai_link *dai_link);

void asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link,

				      int is_single_links);

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

+2 −21
Original line number Diff line number Diff line
@@ -62,25 +62,6 @@ static const struct snd_soc_ops graph_ops = { 
	.hw_params	= asoc_simple_hw_params,

};



static int graph_dai_init(struct snd_soc_pcm_runtime *rtd)

{

	struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);

	int ret = 0;



	ret = asoc_simple_card_init_dai(rtd->codec_dai,

					dai_props->codec_dai);

	if (ret < 0)

		return ret;



	ret = asoc_simple_card_init_dai(rtd->cpu_dai,

					dai_props->cpu_dai);

	if (ret < 0)

		return ret;



	return 0;

}



static int graph_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				    struct snd_pcm_hw_params *params)

{
@@ -255,7 +236,7 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, 
	dai_link->dpcm_playback		= 1;

	dai_link->dpcm_capture		= 1;

	dai_link->ops			= &graph_ops;

	dai_link->init			= graph_dai_init;

	dai_link->init			= asoc_simple_dai_init;



	return 0;

}
@@ -327,7 +308,7 @@ static int graph_dai_link_of(struct asoc_simple_priv *priv, 
		return ret;



	dai_link->ops = &graph_ops;

	dai_link->init = graph_dai_init;

	dai_link->init = asoc_simple_dai_init;



	asoc_simple_card_canonicalize_platform(dai_link);

	asoc_simple_card_canonicalize_cpu(dai_link,

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

+22 −3
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ int asoc_simple_card_parse_graph_dai(struct device_node *ep, 
}

EXPORT_SYMBOL_GPL(asoc_simple_card_parse_graph_dai);



int asoc_simple_card_init_dai(struct snd_soc_dai *dai,

static int asoc_simple_card_init_dai(struct snd_soc_dai *dai,

				     struct asoc_simple_dai *simple_dai)

{

	int ret;
@@ -467,7 +467,26 @@ int asoc_simple_card_init_dai(struct snd_soc_dai *dai, 


	return 0;

}

EXPORT_SYMBOL_GPL(asoc_simple_card_init_dai);



int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd)

{

	struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);

	int ret;



	ret = asoc_simple_card_init_dai(rtd->codec_dai,

					dai_props->codec_dai);

	if (ret < 0)

		return ret;



	ret = asoc_simple_card_init_dai(rtd->cpu_dai,

					dai_props->cpu_dai);

	if (ret < 0)

		return ret;



	return 0;

}

EXPORT_SYMBOL_GPL(asoc_simple_dai_init);



void asoc_simple_card_canonicalize_platform(struct snd_soc_dai_link *dai_link)

{

sound/soc/generic/simple-card.c

+3 −22
Original line number Diff line number Diff line
@@ -32,25 +32,6 @@ static const struct snd_soc_ops simple_ops = { 
	.hw_params	= asoc_simple_hw_params,

};



static int simple_dai_init(struct snd_soc_pcm_runtime *rtd)

{

	struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);

	int ret;



	ret = asoc_simple_card_init_dai(rtd->codec_dai,

					dai_props->codec_dai);

	if (ret < 0)

		return ret;



	ret = asoc_simple_card_init_dai(rtd->cpu_dai,

					dai_props->cpu_dai);

	if (ret < 0)

		return ret;



	return 0;

}



static int simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				     struct snd_pcm_hw_params *params)

{
@@ -221,7 +202,7 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, 
	dai_link->dpcm_playback		= 1;

	dai_link->dpcm_capture		= 1;

	dai_link->ops			= &simple_ops;

	dai_link->init			= simple_dai_init;

	dai_link->init			= asoc_simple_dai_init;



	return 0;

}
@@ -316,7 +297,7 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, 
		goto dai_link_of_err;



	dai_link->ops = &simple_ops;

	dai_link->init = simple_dai_init;

	dai_link->init = asoc_simple_dai_init;



	asoc_simple_card_canonicalize_cpu(dai_link, single_cpu);

	asoc_simple_card_canonicalize_platform(dai_link);
@@ -694,7 +675,7 @@ static int simple_probe(struct platform_device *pdev) 
		dai_link->stream_name	= cinfo->name;

		dai_link->cpu_dai_name	= cinfo->cpu_dai.name;

		dai_link->dai_fmt	= cinfo->daifmt;

		dai_link->init		= simple_dai_init;

		dai_link->init		= asoc_simple_dai_init;

		memcpy(priv->dai_props->cpu_dai, &cinfo->cpu_dai,

					sizeof(*priv->dai_props->cpu_dai));

		memcpy(priv->dai_props->codec_dai, &cinfo->codec_dai,

CRA Git | Maintained and supported by SUSTech CRA and CCSE