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

ASoC: Intel: use for_each_rtd_codecs/cpus_dai() macro 



This patch switch to use plural form macro.

	- for_each_rtd_codec_dai()
	+ for_each_rtd_codec_dais()

	- for_each_rtd_codec_dai_rollback()
	+ for_each_rtd_codec_dais_rollback()

	- for_each_rtd_cpu_dai()
	+ for_each_rtd_cpu_dais()

	- for_each_rtd_cpu_dai_rollback()
	+ for_each_rtd_cpu_dais_rollback()

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/871rq2i320.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/intel/boards/cml_rt1011_rt5682.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static int cml_rt1011_hw_params(struct snd_pcm_substream *substream, 


	srate = params_rate(params);



	for_each_rtd_codec_dai(rtd, i, codec_dai) {

	for_each_rtd_codec_dais(rtd, i, codec_dai) {



		/* 100 Fs to drive 24 bit data */

		ret = snd_soc_dai_set_pll(codec_dai, 0, RT1011_PLL1_S_BCLK,

sound/soc/intel/boards/kbl_da7219_max98927.c

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static int kabylake_ssp0_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_dai *codec_dai;

	int ret, j;



	for_each_rtd_codec_dai(runtime, j, codec_dai) {

	for_each_rtd_codec_dais(runtime, j, codec_dai) {



		if (!strcmp(codec_dai->component->name, MAX98927_DEV0_NAME)) {

			ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x30, 3, 8, 16);
@@ -224,7 +224,7 @@ static int kabylake_ssp0_trigger(struct snd_pcm_substream *substream, int cmd) 
	struct snd_soc_dai *codec_dai;

	int j, ret;



	for_each_rtd_codec_dai(rtd, j, codec_dai) {

	for_each_rtd_codec_dais(rtd, j, codec_dai) {

		const char *name = codec_dai->component->name;

		struct snd_soc_component *component = codec_dai->component;

		struct snd_soc_dapm_context *dapm =

sound/soc/intel/boards/kbl_rt5663_max98927.c

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static int kabylake_ssp0_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_dai *codec_dai;

	int ret = 0, j;



	for_each_rtd_codec_dai(rtd, j, codec_dai) {

	for_each_rtd_codec_dais(rtd, j, codec_dai) {

		if (!strcmp(codec_dai->component->name, MAXIM_DEV0_NAME)) {

			/*

			 * Use channel 4 and 5 for the first amp

sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static int kabylake_ssp0_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_dai *codec_dai;

	int ret = 0, j;



	for_each_rtd_codec_dai(rtd, j, codec_dai) {

	for_each_rtd_codec_dais(rtd, j, codec_dai) {

		if (!strcmp(codec_dai->component->name, RT5514_DEV_NAME)) {

			ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xF, 0, 8, 16);

			if (ret < 0) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE