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

ASoC: amd: 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/874kufk5uu.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/amd/acp-da7219-max98357a.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) 
{

	int ret;

	struct snd_soc_card *card = rtd->card;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

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

	struct snd_soc_component *component = codec_dai->component;



	dev_info(rtd->dev, "codec dai name = %s\n", codec_dai->name);

sound/soc/amd/acp-rt5645.c

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int cz_aif1_hw_params(struct snd_pcm_substream *substream, 
{

	int ret = 0;

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



	ret = snd_soc_dai_set_pll(codec_dai, 0, RT5645_PLL1_S_MCLK,

				  CZ_PLAT_CLK, params_rate(params) * 512);
@@ -73,7 +73,7 @@ static int cz_init(struct snd_soc_pcm_runtime *rtd) 
	struct snd_soc_card *card;

	struct snd_soc_component *codec;



	codec = rtd->codec_dai->component;

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

	card = rtd->card;



	ret = snd_soc_card_jack_new(card, "Headset Jack",

sound/soc/amd/acp3x-rt5682-max9836.c

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd) 
{

	int ret;

	struct snd_soc_card *card = rtd->card;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

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

	struct snd_soc_component *component = codec_dai->component;



	dev_info(rtd->dev, "codec dai name = %s\n", codec_dai->name);
@@ -183,7 +183,7 @@ static int acp3x_ec_dmic0_startup(struct snd_pcm_substream *substream) 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_card *card = rtd->card;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

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

	struct acp3x_platform_info *machine = snd_soc_card_get_drvdata(card);



	machine->cap_i2s_instance = I2S_BT_INSTANCE;
@@ -198,7 +198,7 @@ static int acp3x_ec_dmic1_startup(struct snd_pcm_substream *substream) 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_card *card = rtd->card;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

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

	struct acp3x_platform_info *machine = snd_soc_card_get_drvdata(card);



	machine->cap_i2s_instance = I2S_BT_INSTANCE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE