From 43b7f416783ccc98952a4eb5f9274907442b03e5 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 7 Mar 2022 04:34:52 +0100 Subject: src: Make PCI ID define names shorter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Shorten define names containing PCI_{DEVICE,VENDOR}_ID_ with PCI_{DID,VID}_ using the commands below, which also take care of some spacing issues. An additional clean up of pci_ids.h is done in CB:61531. Used commands: * find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]\{2\}\([_0-9A-Za-z]\{8\}\)*[_0-9A-Za-z]\{0,5\}\)\t/PCI_\1ID_\3\t\t/g' * find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]*\)/PCI_\1ID_\3/g' Change-Id: If9027700f53b6d0d3964c26a41a1f9b8f62be178 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/39331 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- src/soc/intel/common/block/cnvi/cnvi.c | 62 +++++++++++++++++----------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'src/soc/intel/common/block/cnvi') 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, }; -- cgit v1.2.3