ASoC: Intel: sof_sdw: rename id as part_id

The "id" field in sof_sdw_codec_info struct is actually the "part
id". Rename to prevent confusions.

Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.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/20200821195603.215535-10-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index dca981f..ca23145 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -212,20 +212,20 @@ static const struct snd_soc_ops sdw_ops = {
 
 static struct sof_sdw_codec_info codec_info_list[] = {
        {
-               .id = 0x700,
+               .part_id = 0x700,
                .direction = {true, true},
                .dai_name = "rt700-aif1",
                .init = sof_sdw_rt700_init,
        },
        {
-               .id = 0x711,
+               .part_id = 0x711,
                .direction = {true, true},
                .dai_name = "rt711-aif1",
                .init = sof_sdw_rt711_init,
                .exit = sof_sdw_rt711_exit,
        },
        {
-               .id = 0x1308,
+               .part_id = 0x1308,
                .acpi_id = "10EC1308",
                .direction = {true, false},
                .dai_name = "rt1308-aif",
@@ -233,20 +233,20 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                .init = sof_sdw_rt1308_init,
        },
        {
-               .id = 0x715,
+               .part_id = 0x715,
                .direction = {false, true},
                .dai_name = "rt715-aif2",
                .init = sof_sdw_rt715_init,
        },
        {
-               .id = 0x8373,
+               .part_id = 0x8373,
                .direction = {true, true},
                .dai_name = "max98373-aif1",
                .init = sof_sdw_mx8373_init,
                .codec_card_late_probe = sof_sdw_mx8373_late_probe,
        },
        {
-               .id = 0x5682,
+               .part_id = 0x5682,
                .direction = {true, true},
                .dai_name = "rt5682-sdw",
                .init = sof_sdw_rt5682_init,
@@ -265,7 +265,7 @@ static inline int find_codec_info_part(u64 adr)
                 * A codec info is for all sdw version with the part id if
                 * version_id is not specified in the codec info.
                 */
-               if (part_id == codec_info_list[i].id &&
+               if (part_id == codec_info_list[i].part_id &&
                    (!codec_info_list[i].version_id ||
                     sdw_version == codec_info_list[i].version_id))
                        return i;

diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h
index cb13203..ce0680a 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_common.h
+++ b/sound/soc/intel/boards/sof_sdw_common.h
@@ -51,7 +51,7 @@ enum {
 #define SOF_SDW_NO_AGGREGATION         BIT(12)
 
 struct sof_sdw_codec_info {
-       const int id;
+       const int part_id;
        const int version_id;
        int amp_num;
        const u8 acpi_id[ACPI_ID_LEN];