1 files changed, 31 insertions, 31 deletions

diff --git a/src/soc/intel/common/block/cnvi/cnvi.c b/src/soc/intel/common/block/cnvi/cnvi.c
index 8ce313586b..fd0c33de4a 100644
--- a/src/soc/intel/common/block/cnvi/cnvi.c
+++ b/src/soc/intel/common/block/cnvi/cnvi.c
@@ -21,34 +21,34 @@ static struct device_operations cnvi_wifi_ops = {
 };
 
 static const unsigned short wifi_pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_CML_LP_CNVI_WIFI,
-	PCI_DEVICE_ID_INTEL_CML_H_CNVI_WIFI,
-	PCI_DEVICE_ID_INTEL_CNL_LP_CNVI_WIFI,
-	PCI_DEVICE_ID_INTEL_CNL_H_CNVI_WIFI,
-	PCI_DEVICE_ID_INTEL_GLK_CNVI_WIFI,
-	PCI_DEVICE_ID_INTEL_ICL_CNVI_WIFI,
-	PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_0,
-	PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_1,
-	PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_2,
-	PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_3,
-	PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_0,
-	PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_1,
-	PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_2,
-	PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_3,
-	PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_0,
-	PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_1,
-	PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_2,
-	PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_3,
-	PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_0,
-	PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_1,
-	PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_2,
-	PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_3,
+	PCI_DID_INTEL_CML_LP_CNVI_WIFI,
+	PCI_DID_INTEL_CML_H_CNVI_WIFI,
+	PCI_DID_INTEL_CNL_LP_CNVI_WIFI,
+	PCI_DID_INTEL_CNL_H_CNVI_WIFI,
+	PCI_DID_INTEL_GLK_CNVI_WIFI,
+	PCI_DID_INTEL_ICL_CNVI_WIFI,
+	PCI_DID_INTEL_JSL_CNVI_WIFI_0,
+	PCI_DID_INTEL_JSL_CNVI_WIFI_1,
+	PCI_DID_INTEL_JSL_CNVI_WIFI_2,
+	PCI_DID_INTEL_JSL_CNVI_WIFI_3,
+	PCI_DID_INTEL_TGL_CNVI_WIFI_0,
+	PCI_DID_INTEL_TGL_CNVI_WIFI_1,
+	PCI_DID_INTEL_TGL_CNVI_WIFI_2,
+	PCI_DID_INTEL_TGL_CNVI_WIFI_3,
+	PCI_DID_INTEL_TGL_H_CNVI_WIFI_0,
+	PCI_DID_INTEL_TGL_H_CNVI_WIFI_1,
+	PCI_DID_INTEL_TGL_H_CNVI_WIFI_2,
+	PCI_DID_INTEL_TGL_H_CNVI_WIFI_3,
+	PCI_DID_INTEL_ADL_N_CNVI_WIFI_0,
+	PCI_DID_INTEL_ADL_N_CNVI_WIFI_1,
+	PCI_DID_INTEL_ADL_N_CNVI_WIFI_2,
+	PCI_DID_INTEL_ADL_N_CNVI_WIFI_3,
 	0
 };
 
 static const struct pci_driver pch_cnvi_wifi __pci_driver = {
 	.ops			= &cnvi_wifi_ops,
-	.vendor			= PCI_VENDOR_ID_INTEL,
+	.vendor			= PCI_VID_INTEL,
 	.devices		= wifi_pci_device_ids,
 };
 
@@ -68,18 +68,18 @@ static struct device_operations cnvi_bt_ops = {
 };
 
 static const unsigned short bt_pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_0,
-	PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_1,
-	PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_2,
-	PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_3,
-	PCI_DEVICE_ID_INTEL_TGL_H_CNVI_BT_0,
-	PCI_DEVICE_ID_INTEL_TGL_H_CNVI_BT_1,
-	PCI_DEVICE_ID_INTEL_TGL_H_CNVI_BT_2,
+	PCI_DID_INTEL_TGL_CNVI_BT_0,
+	PCI_DID_INTEL_TGL_CNVI_BT_1,
+	PCI_DID_INTEL_TGL_CNVI_BT_2,
+	PCI_DID_INTEL_TGL_CNVI_BT_3,
+	PCI_DID_INTEL_TGL_H_CNVI_BT_0,
+	PCI_DID_INTEL_TGL_H_CNVI_BT_1,
+	PCI_DID_INTEL_TGL_H_CNVI_BT_2,
 	0
 };
 
 static const struct pci_driver pch_cnvi_bt __pci_driver = {
 	.ops			= &cnvi_bt_ops,
-	.vendor			= PCI_VENDOR_ID_INTEL,
+	.vendor			= PCI_VID_INTEL,
 	.devices		= bt_pci_device_ids,
 };