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

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

ASoC: simple-card: code sync: use simple_priv_to_props() macro 



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

sound/soc/generic/simple-card.c

+6 −4
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static int asoc_simple_card_startup(struct snd_pcm_substream *substream) 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

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

	struct simple_dai_props *dai_props =

		&priv->dai_props[rtd->num];

		simple_priv_to_props(priv, rtd->num);

	int ret;



	ret = clk_prepare_enable(dai_props->cpu_dai.clk);
@@ -133,7 +133,7 @@ static void asoc_simple_card_shutdown(struct snd_pcm_substream *substream) 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

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

	struct simple_dai_props *dai_props =

		&priv->dai_props[rtd->num];

		simple_priv_to_props(priv, rtd->num);



	clk_disable_unprepare(dai_props->cpu_dai.clk);
@@ -147,7 +147,8 @@ static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

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

	struct simple_dai_props *dai_props = &priv->dai_props[rtd->num];

	struct simple_dai_props *dai_props =

		simple_priv_to_props(priv, rtd->num);

	unsigned int mclk, mclk_fs = 0;

	int ret = 0;
@@ -184,7 +185,8 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) 
	struct simple_card_data *priv =	snd_soc_card_get_drvdata(rtd->card);

	struct snd_soc_dai *codec = rtd->codec_dai;

	struct snd_soc_dai *cpu = rtd->cpu_dai;

	struct simple_dai_props *dai_props = &priv->dai_props[rtd->num];

	struct simple_dai_props *dai_props =

		simple_priv_to_props(priv, rtd->num);

	int ret;



	ret = asoc_simple_card_init_dai(codec, &dai_props->codec_dai);