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

Use PCI device IDs from pci_ids.h header and while at it change to using
PCI_DEVICE_DATA() macro, to simplify declarations.

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-12-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
index 6375018..859b217 100644 (file)
--- a/sound/soc/intel/avs/core.c
+++ b/sound/soc/intel/avs/core.c
@@ -745,14 +745,14 @@ static const struct avs_spec apl_desc = {
 };
 
 static const struct pci_device_id avs_ids[] = {
-       { PCI_VDEVICE(INTEL, 0x9d70), (unsigned long)&skl_desc }, /* SKL */
-       { PCI_VDEVICE(INTEL, 0xa170), (unsigned long)&skl_desc }, /* SKL-H */
-       { PCI_VDEVICE(INTEL, 0x9d71), (unsigned long)&skl_desc }, /* KBL */
-       { PCI_VDEVICE(INTEL, 0xa171), (unsigned long)&skl_desc }, /* KBL-H */
-       { PCI_VDEVICE(INTEL, 0xa2f0), (unsigned long)&skl_desc }, /* KBL-S */
-       { PCI_VDEVICE(INTEL, 0xa3f0), (unsigned long)&skl_desc }, /* CML-V */
-       { PCI_VDEVICE(INTEL, 0x5a98), (unsigned long)&apl_desc }, /* APL */
-       { PCI_VDEVICE(INTEL, 0x3198), (unsigned long)&apl_desc }, /* GML */
+       { PCI_DEVICE_DATA(INTEL, HDA_SKL_LP, &skl_desc) },
+       { PCI_DEVICE_DATA(INTEL, HDA_SKL, &skl_desc) },
+       { PCI_DEVICE_DATA(INTEL, HDA_KBL_LP, &skl_desc) },
+       { PCI_DEVICE_DATA(INTEL, HDA_KBL, &skl_desc) },
+       { PCI_DEVICE_DATA(INTEL, HDA_KBL_H, &skl_desc) },
+       { PCI_DEVICE_DATA(INTEL, HDA_CML_S, &skl_desc) },
+       { PCI_DEVICE_DATA(INTEL, HDA_APL, &apl_desc) },
+       { PCI_DEVICE_DATA(INTEL, HDA_GML, &apl_desc) },
        { 0 }
 };
 MODULE_DEVICE_TABLE(pci, avs_ids);