src: Make PCI ID define names shorter

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 <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39331
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>

src/northbridge/amd/agesa/family14/northbridge.c

@@ -791,7 +791,7 @@ static struct device_operations northbridge_operations = {
 
 static const struct pci_driver northbridge_driver __pci_driver = {
 	.ops = &northbridge_operations,
-	.vendor = PCI_VENDOR_ID_AMD,
+	.vendor = PCI_VID_AMD,
 	.device = 0x1510,
 };
 

src/northbridge/amd/agesa/family15tn/iommu.c

@@ -45,6 +45,6 @@ static struct device_operations iommu_ops = {
 
 static const struct pci_driver iommu_driver __pci_driver = {
 	.ops = &iommu_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_15H_MODEL_101F_NB_IOMMU,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_15H_MODEL_101F_NB_IOMMU,
 };

src/northbridge/amd/agesa/family15tn/northbridge.c

@@ -562,14 +562,14 @@ static struct device_operations northbridge_operations = {
 
 static const struct pci_driver family15_northbridge __pci_driver = {
 	.ops	= &northbridge_operations,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_15H_MODEL_101F_NB_HT,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_15H_MODEL_101F_NB_HT,
 };
 
 static const struct pci_driver family10_northbridge __pci_driver = {
 	.ops	= &northbridge_operations,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_10H_NB_HT,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_10H_NB_HT,
 };
 
 struct chip_operations northbridge_amd_agesa_family15tn_ops = {

src/northbridge/amd/agesa/family16kb/northbridge.c

@@ -556,14 +556,14 @@ static struct device_operations northbridge_operations = {
 
 static const struct pci_driver family16_northbridge __pci_driver = {
 	.ops	= &northbridge_operations,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_16H_MODEL_000F_NB_HT,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_16H_MODEL_000F_NB_HT,
 };
 
 static const struct pci_driver family10_northbridge __pci_driver = {
 	.ops	= &northbridge_operations,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_10H_NB_HT,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_10H_NB_HT,
 };
 
 static void fam16_finalize(void *chip_info)

src/northbridge/amd/pi/00730F01/iommu.c

@@ -30,6 +30,6 @@ static struct device_operations iommu_ops = {
 
 static const struct pci_driver iommu_driver __pci_driver = {
 	.ops = &iommu_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_IOMMU,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_16H_MODEL_303F_NB_IOMMU,
 };

src/northbridge/amd/pi/00730F01/northbridge.c

@@ -669,14 +669,14 @@ static struct device_operations northbridge_operations = {
 
 static const struct pci_driver family16_northbridge __pci_driver = {
 	.ops	= &northbridge_operations,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_HT,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_16H_MODEL_303F_NB_HT,
 };
 
 static const struct pci_driver family10_northbridge __pci_driver = {
 	.ops	= &northbridge_operations,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_10H_NB_HT,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_10H_NB_HT,
 };
 
 static void fam16_finalize(void *chip_info)

src/northbridge/intel/gm45/gma.c

@@ -217,6 +217,6 @@ static const unsigned short pci_device_ids[] =
 
 static const struct pci_driver gma __pci_driver = {
 	.ops = &gma_func0_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
+	.vendor = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/northbridge/intel/haswell/gma.c

@@ -492,6 +492,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver pch_lpc __pci_driver = {
 	.ops     = &gma_func0_ops,
-	.vendor  = PCI_VENDOR_ID_INTEL,
+	.vendor  = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/northbridge/intel/haswell/minihd.c

@@ -97,6 +97,6 @@ static const unsigned short pci_device_ids[] = { 0x0a0c, 0x0c0c, 0x0d0c, 0 };
 
 static const struct pci_driver haswell_minihd __pci_driver = {
 	.ops	 = &minihd_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/northbridge/intel/haswell/northbridge.c

@@ -557,7 +557,7 @@ static const unsigned short mc_pci_device_ids[] = {
 
 static const struct pci_driver mc_driver_hsw __pci_driver = {
 	.ops     = &mc_ops,
-	.vendor  = PCI_VENDOR_ID_INTEL,
+	.vendor  = PCI_VID_INTEL,
 	.devices = mc_pci_device_ids,
 };
 

src/northbridge/intel/haswell/pcie.c

@@ -170,6 +170,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver pch_pcie __pci_driver = {
 	.ops		= &device_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= pci_device_ids,
 };

src/northbridge/intel/i440bx/northbridge.c

@@ -23,7 +23,7 @@ static struct device_operations northbridge_operations = {
 
 static const struct pci_driver northbridge_driver __pci_driver = {
 	.ops = &northbridge_operations,
-	.vendor = PCI_VENDOR_ID_INTEL,
+	.vendor = PCI_VID_INTEL,
 	.device = 0x7190,
 };
 

src/northbridge/intel/i945/gma.c

@@ -767,12 +767,12 @@ static const unsigned short i945_gma_func1_ids[] = {
 
 static const struct pci_driver i945_gma_func0_driver __pci_driver = {
 	.ops		= &gma_func0_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= i945_gma_func0_ids,
 };
 
 static const struct pci_driver i945_gma_func1_driver __pci_driver = {
 	.ops		= &gma_func1_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= i945_gma_func1_ids,
 };

src/northbridge/intel/i945/northbridge.c

@@ -150,7 +150,7 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver mc_driver __pci_driver = {
 	.ops    = &mc_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
+	.vendor = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };
 

src/northbridge/intel/ironlake/gma.c

@@ -208,6 +208,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver gma __pci_driver = {
 	.ops	 = &gma_func0_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/northbridge/intel/ironlake/northbridge.c

@@ -215,7 +215,7 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver mc_driver_ilk __pci_driver = {
 	.ops     = &mc_ops,
-	.vendor  = PCI_VENDOR_ID_INTEL,
+	.vendor  = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };
 

src/northbridge/intel/pineview/gma.c

@@ -280,6 +280,6 @@ static const unsigned short pci_device_ids[] =
 
 static const struct pci_driver gma __pci_driver = {
 	.ops     = &gma_func0_ops,
-	.vendor  = PCI_VENDOR_ID_INTEL,
+	.vendor  = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/northbridge/intel/sandybridge/gma.c

@@ -660,6 +660,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver gma __pci_driver = {
 	.ops     = &gma_func0_ops,
-	.vendor  = PCI_VENDOR_ID_INTEL,
+	.vendor  = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/northbridge/intel/sandybridge/northbridge.c

@@ -389,7 +389,7 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver mc_driver __pci_driver = {
 	.ops     = &mc_ops,
-	.vendor  = PCI_VENDOR_ID_INTEL,
+	.vendor  = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };
 

src/northbridge/intel/sandybridge/pcie.c

@@ -64,6 +64,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver pch_pcie __pci_driver = {
 	.ops		= &device_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= pci_device_ids,
 };

src/northbridge/intel/x4x/gma.c

@@ -87,6 +87,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver gma __pci_driver = {
 	.ops = &gma_func0_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
+	.vendor = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };