ASoC: qcom: 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/87wo7ugogy.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index fb30bbe..440effe 100644 (file)
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -603,7 +603,7 @@ static int qcom_swrm_startup(struct snd_pcm_substream *substream,
 
        ctrl->sruntime[dai->id] = sruntime;
 
-       for_each_rtd_codec_dai(rtd, i, codec_dai) {
+       for_each_rtd_codec_dais(rtd, i, codec_dai) {
                ret = snd_soc_dai_set_sdw_stream(codec_dai, sruntime,
                                                 substream->stream);
                if (ret < 0 && ret != -ENOTSUPP) {

diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c
index 2d064f3..7647af3 100644 (file)
--- a/sound/soc/qcom/apq8016_sbc.c
+++ b/sound/soc/qcom/apq8016_sbc.c
@@ -90,7 +90,7 @@ static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd)
                pdata->jack_setup = true;
        }
 
-       for_each_rtd_codec_dai(rtd, i, codec_dai) {
+       for_each_rtd_codec_dais(rtd, i, codec_dai) {
 
                component = codec_dai->component;
                /* Set default mclk for internal codec */

diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c
index 5a23597..3ac0220 100644 (file)
--- a/sound/soc/qcom/sdm845.c
+++ b/sound/soc/qcom/sdm845.c
@@ -49,7 +49,7 @@ static int sdm845_slim_snd_hw_params(struct snd_pcm_substream *substream,
        u32 rx_ch_cnt = 0, tx_ch_cnt = 0;
        int ret = 0, i;
 
-       for_each_rtd_codec_dai(rtd, i, codec_dai) {
+       for_each_rtd_codec_dais(rtd, i, codec_dai) {
                ret = snd_soc_dai_get_channel_map(codec_dai,
                                &tx_ch_cnt, tx_ch, &rx_ch_cnt, rx_ch);
 
@@ -126,7 +126,7 @@ static int sdm845_tdm_snd_hw_params(struct snd_pcm_substream *substream,
                }
        }
 
-       for_each_rtd_codec_dai(rtd, j, codec_dai) {
+       for_each_rtd_codec_dais(rtd, j, codec_dai) {
 
                if (!strcmp(codec_dai->component->name_prefix, "Left")) {
                        ret = snd_soc_dai_set_tdm_slot(
@@ -265,7 +265,7 @@ static int sdm845_dai_init(struct snd_soc_pcm_runtime *rtd)
                }
                break;
        case SLIMBUS_0_RX...SLIMBUS_6_TX:
-               for_each_rtd_codec_dai(rtd, i, codec_dai) {
+               for_each_rtd_codec_dais(rtd, i, codec_dai) {
                        rval = snd_soc_dai_set_channel_map(codec_dai,
                                                          ARRAY_SIZE(tx_ch),
                                                          tx_ch,
@@ -344,7 +344,7 @@ static int sdm845_snd_startup(struct snd_pcm_substream *substream)
 
                codec_dai_fmt |= SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_DSP_B;
 
-               for_each_rtd_codec_dai(rtd, j, codec_dai) {
+               for_each_rtd_codec_dais(rtd, j, codec_dai) {
 
                        if (!strcmp(codec_dai->component->name_prefix,
                                    "Left")) {