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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/871rq2i320.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/cml_rt1011_rt5682.c b/sound/soc/intel/boards/cml_rt1011_rt5682.c
index 02aa18d24319cf9f790e5837fcbc8cb8aa03a23b..2a6e5b124099236142266f675deb6e6122f2c3c7 100644 (file)
--- a/sound/soc/intel/boards/cml_rt1011_rt5682.c
+++ b/sound/soc/intel/boards/cml_rt1011_rt5682.c
@@ -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,

diff --git a/sound/soc/intel/boards/kbl_da7219_max98927.c b/sound/soc/intel/boards/kbl_da7219_max98927.c
index 88f69e3697d21a7c3acc09c1d7e5c091ffd252ad..0ceb1748a262251864dd9d9c1e6a4e98d0022cab 100644 (file)
--- a/sound/soc/intel/boards/kbl_da7219_max98927.c
+++ b/sound/soc/intel/boards/kbl_da7219_max98927.c
@@ -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 =

diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c
index d8f2ff7139a9de93fd15149cb22aa5146b33f59f..f65feee1c16603dc4ca69944b0a7a5951789095c 100644 (file)
--- a/sound/soc/intel/boards/kbl_rt5663_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
@@ -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

diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
index 96c814f364581bbd30a1ada36a17b262ba3b14f0..341bb47311a682f89569207972ae939a04ab6891 100644 (file)
--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
@@ -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) {