ASoC: Intel: sof_sdw: rename link_id to be_id
authorBard Liao <yung-chuan.liao@linux.intel.com>
Mon, 31 Jul 2023 21:42:41 +0000 (16:42 -0500)
committerMark Brown <broonie@kernel.org>
Mon, 31 Jul 2023 22:22:28 +0000 (23:22 +0100)
The link_id parameter in create_sdw_dailink is actually the BE link id.
Rename it to be_id to be consistent with the caller and less confusion.
No functionality change.

Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230731214257.444605-8-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/sof_sdw.c

index 7e43be46cfa815feec43c1b30296b6e4b1f132fd..acaedd3b2224efae32b04a0260811438231e1439 100644 (file)
@@ -1354,7 +1354,7 @@ static int create_sdw_dailink(struct snd_soc_card *card,
                              const struct snd_soc_acpi_link_adr *link,
                              int *cpu_id, bool *group_generated,
                              struct snd_soc_codec_conf *codec_conf,
-                             int codec_count, int *link_id,
+                             int codec_count, int *be_id,
                              int *codec_conf_index,
                              bool *ignore_pch_dmic,
                              bool append_dai_type,
@@ -1433,9 +1433,9 @@ static int create_sdw_dailink(struct snd_soc_card *card,
                if (!codec_info->dais[dai_index].direction[stream])
                        continue;
 
-               *link_id = codec_info->dais[dai_index].dailink[stream];
-               if (*link_id < 0) {
-                       dev_err(dev, "Invalid dailink id %d\n", *link_id);
+               *be_id = codec_info->dais[dai_index].dailink[stream];
+               if (*be_id < 0) {
+                       dev_err(dev, "Invalid dailink id %d\n", *be_id);
                        return -EINVAL;
                }
 
@@ -1492,7 +1492,7 @@ static int create_sdw_dailink(struct snd_soc_card *card,
 
                playback = (stream == SNDRV_PCM_STREAM_PLAYBACK);
                capture = (stream == SNDRV_PCM_STREAM_CAPTURE);
-               init_dai_link(dev, dai_links + *link_index, (*link_id)++, name,
+               init_dai_link(dev, dai_links + *link_index, (*be_id)++, name,
                              playback, capture,
                              cpus + *cpu_id, cpu_dai_num,
                              codecs, codec_num,