<p>Tristan Corrick has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29396">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nb/intel/haswell: Consolidate memory controller PCI driver structs<br><br>Since the `PCI_DEVICE_ID_HSW_*` constants are no longer used, remove<br>them.<br><br>Change-Id: I84f1f069faa6a4165cf289f2e6c40889a49cad1d<br>Signed-off-by: Tristan Corrick <tristan@corrick.kiwi><br>---<br>M src/northbridge/intel/haswell/haswell.h<br>M src/northbridge/intel/haswell/northbridge.c<br>2 files changed, 8 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/29396/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/northbridge/intel/haswell/haswell.h b/src/northbridge/intel/haswell/haswell.h</span><br><span>index d14ee4f..33818ee 100644</span><br><span>--- a/src/northbridge/intel/haswell/haswell.h</span><br><span>+++ b/src/northbridge/intel/haswell/haswell.h</span><br><span>@@ -210,10 +210,6 @@</span><br><span>     u8 reserved[34];</span><br><span> } __packed;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define PCI_DEVICE_ID_HSW_DESKTOP 0x0c00</span><br><span style="color: hsl(0, 100%, 40%);">-#define PCI_DEVICE_ID_HSW_MOBILE 0x0c04</span><br><span style="color: hsl(0, 100%, 40%);">-#define PCI_DEVICE_ID_HSW_ULT 0x0a04</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #ifdef __SMM__</span><br><span> void intel_northbridge_haswell_finalize_smm(void);</span><br><span> #else /* !__SMM__ */</span><br><span>diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c</span><br><span>index ccfb234..a2dd28b 100644</span><br><span>--- a/src/northbridge/intel/haswell/northbridge.c</span><br><span>+++ b/src/northbridge/intel/haswell/northbridge.c</span><br><span>@@ -461,22 +461,16 @@</span><br><span>      .ops_pci          = &intel_pci_ops,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct pci_driver mc_driver_hsw_normal __pci_driver = {</span><br><span style="color: hsl(0, 100%, 40%);">-   .ops    = &mc_ops,</span><br><span style="color: hsl(0, 100%, 40%);">-  .vendor = PCI_VENDOR_ID_INTEL,</span><br><span style="color: hsl(0, 100%, 40%);">-  .device = PCI_DEVICE_ID_HSW_DESKTOP,</span><br><span style="color: hsl(120, 100%, 40%);">+static const unsigned short mc_pci_device_ids[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+     0x0c00, /* Desktop */</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x0c04, /* Mobile */</span><br><span style="color: hsl(120, 100%, 40%);">+  0x0a04, /* ULT */</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct pci_driver mc_driver_hsw_mobile __pci_driver = {</span><br><span style="color: hsl(0, 100%, 40%);">- .ops    = &mc_ops,</span><br><span style="color: hsl(0, 100%, 40%);">-  .vendor = PCI_VENDOR_ID_INTEL,</span><br><span style="color: hsl(0, 100%, 40%);">-  .device = PCI_DEVICE_ID_HSW_MOBILE,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const struct pci_driver mc_driver_hsw_ult __pci_driver = {</span><br><span style="color: hsl(0, 100%, 40%);">-  .ops    = &mc_ops,</span><br><span style="color: hsl(0, 100%, 40%);">-  .vendor = PCI_VENDOR_ID_INTEL,</span><br><span style="color: hsl(0, 100%, 40%);">-  .device = PCI_DEVICE_ID_HSW_ULT,</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct pci_driver mc_driver_hsw __pci_driver = {</span><br><span style="color: hsl(120, 100%, 40%);">+       .ops     = &mc_ops,</span><br><span style="color: hsl(120, 100%, 40%);">+       .vendor  = PCI_VENDOR_ID_INTEL,</span><br><span style="color: hsl(120, 100%, 40%);">+       .devices = mc_pci_device_ids,</span><br><span> };</span><br><span> </span><br><span> static void cpu_bus_init(struct device *dev)</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29396">change 29396</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/29396"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I84f1f069faa6a4165cf289f2e6c40889a49cad1d </div>
<div style="display:none"> Gerrit-Change-Number: 29396 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Tristan Corrick <tristan@corrick.kiwi> </div>