From 5ac7c1b293107f43afb515665204587c423227f5 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Thu, 25 Jun 2020 14:13:03 -0500 Subject: [PATCH] ASoC: intel: cml_rt1011_rt5682: use for_each_card_prelinks for_each_card_prelinks() is a common API to walk through each prelink in the card. Signed-off-by: Bard Liao Signed-off-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Link: https://lore.kernel.org/r/20200625191308.3322-13-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown --- sound/soc/intel/boards/cml_rt1011_rt5682.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/intel/boards/cml_rt1011_rt5682.c b/sound/soc/intel/boards/cml_rt1011_rt5682.c index d29b4a8ff70d..3f8b7d9820cd 100644 --- a/sound/soc/intel/boards/cml_rt1011_rt5682.c +++ b/sound/soc/intel/boards/cml_rt1011_rt5682.c @@ -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); } } }