From 83344cf60b7b212272aae365f9346c387873b059 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek@redhat.com>
Date: Tue, 14 Jul 2015 12:02:25 +0000
Subject: [PATCH] OvmfPkg: PciHostBridgeDxe: eliminate
 PCI_HOST_BRIDGE_INSTANCE.RootBridgeNumber

This field was supposed to store the number of root buses created; however
we don't need to keep that count persistently. After the entry point returns,
nothing reads this field.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Regression-tested-by: Gabriel Somlo <somlo@cmu.edu>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17961 6f19259b-4bc3-4df7-8a09-765794883524
---
 OvmfPkg/PciHostBridgeDxe/PciHostBridge.c | 4 +---
 OvmfPkg/PciHostBridgeDxe/PciHostBridge.h | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/OvmfPkg/PciHostBridgeDxe/PciHostBridge.c b/OvmfPkg/PciHostBridgeDxe/PciHostBridge.c
index a5dbe57eb2..7dda75f0d3 100644
--- a/OvmfPkg/PciHostBridgeDxe/PciHostBridge.c
+++ b/OvmfPkg/PciHostBridgeDxe/PciHostBridge.c
@@ -56,7 +56,6 @@ EFI_HANDLE mDriverImageHandle;
 PCI_HOST_BRIDGE_INSTANCE mPciHostBridgeInstanceTemplate = {
   PCI_HOST_BRIDGE_SIGNATURE,  // Signature
   NULL,                       // HostBridgeHandle
-  0,                          // RootBridgeNumber
   {NULL, NULL},               // Head
   FALSE,                      // ResourceSubiteed
   TRUE,                       // CanRestarted
@@ -213,7 +212,6 @@ InitializePciHostBridge (
     return EFI_OUT_OF_RESOURCES;
   }
 
-  HostBridge->RootBridgeNumber = 1;
   InitializeListHead (&HostBridge->Head);
 
   Status = gBS->InstallMultipleProtocolInterfaces (
@@ -227,7 +225,7 @@ InitializePciHostBridge (
   }
 
   for (RootBridgeNumber = 0;
-       RootBridgeNumber < HostBridge->RootBridgeNumber;
+       RootBridgeNumber < 1;
        ++RootBridgeNumber) {
     Status = InitRootBridge (
                (UINT8)RootBridgeNumber,
diff --git a/OvmfPkg/PciHostBridgeDxe/PciHostBridge.h b/OvmfPkg/PciHostBridgeDxe/PciHostBridge.h
index d2c28bcd20..617c68e318 100644
--- a/OvmfPkg/PciHostBridgeDxe/PciHostBridge.h
+++ b/OvmfPkg/PciHostBridgeDxe/PciHostBridge.h
@@ -52,7 +52,6 @@ typedef enum {
 typedef struct {
   UINTN                                             Signature;
   EFI_HANDLE                                        HostBridgeHandle;
-  UINTN                                             RootBridgeNumber;
   LIST_ENTRY                                        Head;
   BOOLEAN                                           ResourceSubmited;
   BOOLEAN                                           CanRestarted;
-- 
2.39.2