ASoC: intel: cml_rt1011_rt5682: use for_each_card_prelinks
authorBard Liao <yung-chuan.liao@linux.intel.com>
Thu, 25 Jun 2020 19:13:03 +0000 (14:13 -0500)
committerMark Brown <broonie@kernel.org>
Fri, 26 Jun 2020 12:35:21 +0000 (13:35 +0100)
for_each_card_prelinks() is a common API to walk through each prelink
in the card.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20200625191308.3322-13-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/cml_rt1011_rt5682.c

index d29b4a8..3f8b7d9 100644 (file)
@@ -533,6 +533,7 @@ static struct snd_soc_card snd_soc_card_cml = {
 
 static int snd_cml_rt1011_probe(struct platform_device *pdev)
 {
+       struct snd_soc_dai_link *dai_link;
        struct card_private *ctx;
        struct snd_soc_acpi_mach *mach;
        const char *platform_name;
@@ -554,12 +555,11 @@ static int snd_cml_rt1011_probe(struct platform_device *pdev)
        /* when 4 speaker is available, update codec config */
        if (sof_rt1011_quirk & (SOF_RT1011_SPEAKER_TL |
                                SOF_RT1011_SPEAKER_TR)) {
-               for (i = 0; i < ARRAY_SIZE(cml_rt1011_rt5682_dailink); i++) {
-                       if (!strcmp(cml_rt1011_rt5682_dailink[i].codecs->dai_name,
+               for_each_card_prelinks(&snd_soc_card_cml, i, dai_link) {
+                       if (!strcmp(dai_link->codecs->dai_name,
                                    CML_RT1011_CODEC_DAI)) {
-                               cml_rt1011_rt5682_dailink[i].codecs = ssp1_codec_4spk;
-                               cml_rt1011_rt5682_dailink[i].num_codecs =
-                                               ARRAY_SIZE(ssp1_codec_4spk);
+                               dai_link->codecs = ssp1_codec_4spk;
+                               dai_link->num_codecs = ARRAY_SIZE(ssp1_codec_4spk);
                        }
                }
        }