ASoC: Intel: avs: Convert to PCI device IDs defines

Use PCI device IDs from pci_ids.h header. Adjust AVS_MACH_ENTRY() macro,
so device ID can be provided in short form.

Acked-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20230717114511.484999-13-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/soc/intel/avs/board_selection.c b/sound/soc/intel/avs/board_selection.c
index 60f8fb0bff95b1b3331b478a8de6f95a47076b61..b32e02940e30f14eb84325b7cbc5347ef37a0b6f 100644 (file)
--- a/sound/soc/intel/avs/board_selection.c
+++ b/sound/soc/intel/avs/board_selection.c
@@ -263,14 +263,14 @@ struct avs_acpi_boards {
 };
 
 #define AVS_MACH_ENTRY(_id, _mach) \
-       { .id = (_id), .machs = (_mach), }
+       { .id = PCI_DEVICE_ID_INTEL_##_id, .machs = (_mach), }
 
 /* supported I2S boards per platform */
 static const struct avs_acpi_boards i2s_boards[] = {
-       AVS_MACH_ENTRY(0x9d70, avs_skl_i2s_machines), /* SKL */
-       AVS_MACH_ENTRY(0x9d71, avs_kbl_i2s_machines), /* KBL */
-       AVS_MACH_ENTRY(0x5a98, avs_apl_i2s_machines), /* APL */
-       AVS_MACH_ENTRY(0x3198, avs_gml_i2s_machines), /* GML */
+       AVS_MACH_ENTRY(HDA_SKL_LP, avs_skl_i2s_machines),
+       AVS_MACH_ENTRY(HDA_KBL_LP, avs_kbl_i2s_machines),
+       AVS_MACH_ENTRY(HDA_APL, avs_apl_i2s_machines),
+       AVS_MACH_ENTRY(HDA_GML, avs_gml_i2s_machines),
        {},
 };