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

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



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_be_hw_params_fixup() 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 ad934ca8

include/sound/simple_card_utils.h

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ 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);

int asoc_simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				   struct snd_pcm_hw_params *params);



#define asoc_simple_card_parse_cpu(node, dai_link,				\

				   list_name, cells_name, is_single_link)	\

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

+1 −12
Original line number Diff line number Diff line
@@ -62,17 +62,6 @@ static const struct snd_soc_ops graph_ops = { 
	.hw_params	= asoc_simple_hw_params,

};



static int graph_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				    struct snd_pcm_hw_params *params)

{

	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);



	asoc_simple_card_convert_fixup(&dai_props->adata, params);



	return 0;

}



static void graph_parse_convert(struct device *dev,

				struct device_node *ep,

				struct asoc_simple_card_data *adata)
@@ -186,7 +175,7 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, 


		/* BE settings */

		dai_link->no_pcm		= 1;

		dai_link->be_hw_params_fixup	= graph_be_hw_params_fixup;

		dai_link->be_hw_params_fixup	= asoc_simple_be_hw_params_fixup;



		dai =

		dai_props->codec_dai	= &priv->dais[li->dais++];

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

+12 −0
Original line number Diff line number Diff line
@@ -293,6 +293,18 @@ err: 
}

EXPORT_SYMBOL_GPL(asoc_simple_hw_params);



int asoc_simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				   struct snd_pcm_hw_params *params)

{

	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);



	asoc_simple_card_convert_fixup(&dai_props->adata, params);



	return 0;

}

EXPORT_SYMBOL_GPL(asoc_simple_be_hw_params_fixup);



int asoc_simple_card_parse_dai(struct device_node *node,

				    struct snd_soc_dai_link_component *dlc,

				    struct device_node **dai_of_node,

sound/soc/generic/simple-card.c

+1 −12
Original line number Diff line number Diff line
@@ -32,17 +32,6 @@ static const struct snd_soc_ops simple_ops = { 
	.hw_params	= asoc_simple_hw_params,

};



static int simple_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,

				     struct snd_pcm_hw_params *params)

{

	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);



	asoc_simple_card_convert_fixup(&dai_props->adata, params);



	return 0;

}



static void simple_parse_convert(struct device *dev,

				 struct device_node *np,

				 struct asoc_simple_card_data *adata)
@@ -154,7 +143,7 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, 


		/* BE settings */

		dai_link->no_pcm		= 1;

		dai_link->be_hw_params_fixup	= simple_be_hw_params_fixup;

		dai_link->be_hw_params_fixup	= asoc_simple_be_hw_params_fixup;



		dai =

		dai_props->codec_dai	= &priv->dais[li->dais++];

CRA Git | Maintained and supported by SUSTech CRA and CCSE