Tristan Corrick has uploaded this change for review.

View Change

nb/intel/haswell: Consolidate memory controller PCI driver structs

Since the `PCI_DEVICE_ID_HSW_*` constants are no longer used, remove
them.

Change-Id: I84f1f069faa6a4165cf289f2e6c40889a49cad1d
Signed-off-by: Tristan Corrick <tristan@corrick.kiwi>
---
M src/northbridge/intel/haswell/haswell.h
M src/northbridge/intel/haswell/northbridge.c
2 files changed, 8 insertions(+), 18 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/29396/1

diff --git a/src/northbridge/intel/haswell/haswell.h b/src/northbridge/intel/haswell/haswell.h
index d14ee4f..33818ee 100644
--- a/src/northbridge/intel/haswell/haswell.h
+++ b/src/northbridge/intel/haswell/haswell.h
@@ -210,10 +210,6 @@
 	u8 reserved[34];
 } __packed;
 
-#define PCI_DEVICE_ID_HSW_DESKTOP 0x0c00
-#define PCI_DEVICE_ID_HSW_MOBILE 0x0c04
-#define PCI_DEVICE_ID_HSW_ULT 0x0a04
-
 #ifdef __SMM__
 void intel_northbridge_haswell_finalize_smm(void);
 #else /* !__SMM__ */
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index ccfb234..a2dd28b 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -461,22 +461,16 @@
 	.ops_pci          = &intel_pci_ops,
 };
 
-static const struct pci_driver mc_driver_hsw_normal __pci_driver = {
-	.ops	= &mc_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_HSW_DESKTOP,
+static const unsigned short mc_pci_device_ids[] = {
+	0x0c00, /* Desktop */
+	0x0c04, /* Mobile */
+	0x0a04, /* ULT */
 };
 
-static const struct pci_driver mc_driver_hsw_mobile __pci_driver = {
-	.ops    = &mc_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_HSW_MOBILE,
-};
-
-static const struct pci_driver mc_driver_hsw_ult __pci_driver = {
-	.ops    = &mc_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_HSW_ULT,
+static const struct pci_driver mc_driver_hsw __pci_driver = {
+	.ops     = &mc_ops,
+	.vendor  = PCI_VENDOR_ID_INTEL,
+	.devices = mc_pci_device_ids,
 };
 
 static void cpu_bus_init(struct device *dev)

To view, visit change 29396. To unsubscribe, or for help writing mail filters, visit settings.