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

ASoC: samsung: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer 



Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/87ftdzir57.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/samsung/arndale.c

+3 −3
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ static int arndale_rt5631_hw_params(struct snd_pcm_substream *substream, 
				    struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	int rfs, ret;

	unsigned long rclk;
@@ -56,7 +56,7 @@ static int arndale_wm1811_hw_params(struct snd_pcm_substream *substream, 
				    struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	unsigned int rfs, rclk;



	/* Ensure AIF1CLK is >= 3 MHz for optimal performance */

sound/soc/samsung/bells.c

+8 −8
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int bells_set_bias_level(struct snd_soc_card *card, 
	int ret;



	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_DSP_CODEC]);

	codec_dai = rtd->codec_dai;

	codec_dai = asoc_rtd_to_codec(rtd, 0);

	component = codec_dai->component;



	if (dapm->dev != codec_dai->dev)
@@ -106,7 +106,7 @@ static int bells_set_bias_level_post(struct snd_soc_card *card, 
	int ret;



	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_DSP_CODEC]);

	codec_dai = rtd->codec_dai;

	codec_dai = asoc_rtd_to_codec(rtd, 0);

	component = codec_dai->component;



	if (dapm->dev != codec_dai->dev)
@@ -152,11 +152,11 @@ static int bells_late_probe(struct snd_soc_card *card) 
	int ret;



	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_AP_DSP]);

	wm0010 = rtd->codec_dai->component;

	wm0010 = asoc_rtd_to_codec(rtd, 0)->component;



	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_DSP_CODEC]);

	component = rtd->codec_dai->component;

	aif1_dai = rtd->codec_dai;

	component = asoc_rtd_to_codec(rtd, 0)->component;

	aif1_dai = asoc_rtd_to_codec(rtd, 0);



	ret = snd_soc_component_set_sysclk(component, ARIZONA_CLK_SYSCLK,

				       ARIZONA_CLK_SRC_FLL1,
@@ -195,7 +195,7 @@ static int bells_late_probe(struct snd_soc_card *card) 
	}



	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_CODEC_CP]);

	aif2_dai = rtd->cpu_dai;

	aif2_dai = asoc_rtd_to_cpu(rtd, 0);



	ret = snd_soc_dai_set_sysclk(aif2_dai, ARIZONA_CLK_ASYNCCLK, 0, 0);

	if (ret != 0) {
@@ -207,8 +207,8 @@ static int bells_late_probe(struct snd_soc_card *card) 
		return 0;



	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_CODEC_SUB]);

	aif3_dai = rtd->cpu_dai;

	wm9081_dai = rtd->codec_dai;

	aif3_dai = asoc_rtd_to_cpu(rtd, 0);

	wm9081_dai = asoc_rtd_to_codec(rtd, 0);



	ret = snd_soc_dai_set_sysclk(aif3_dai, ARIZONA_CLK_SYSCLK, 0, 0);

	if (ret != 0) {

sound/soc/samsung/h1940_uda1380.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int h1940_hw_params(struct snd_pcm_substream *substream, 
				struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	int div;

	int ret;

	unsigned int rate = params_rate(params);

sound/soc/samsung/i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static int i2s_trigger(struct snd_pcm_substream *substream, 
	struct samsung_i2s_priv *priv = snd_soc_dai_get_drvdata(dai);

	int capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE);

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct i2s_dai *i2s = to_info(rtd->cpu_dai);

	struct i2s_dai *i2s = to_info(asoc_rtd_to_cpu(rtd, 0));

	unsigned long flags;



	switch (cmd) {

sound/soc/samsung/jive_wm8750.c

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ static int jive_hw_params(struct snd_pcm_substream *substream, 
			  struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	struct s3c_i2sv2_rate_calc div;

	unsigned int clk = 0;

	int ret = 0;