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

diff --git a/OvmfPkg/PciHostBridgeDxe/PciHostBridge.c b/OvmfPkg/PciHostBridgeDxe/PciHostBridge.c
index a5dbe57eb28548340877d350e7ec37bbbbf8aa2e..7dda75f0d3ea03c2fefb3aba1cc385052271bb3b 100644 (file)
--- a/OvmfPkg/PciHostBridgeDxe/PciHostBridge.c
+++ b/OvmfPkg/PciHostBridgeDxe/PciHostBridge.c
@@ -56,7 +56,6 @@ EFI_HANDLE mDriverImageHandle;
 PCI_HOST_BRIDGE_INSTANCE mPciHostBridgeInstanceTemplate = {\r
   PCI_HOST_BRIDGE_SIGNATURE,  // Signature\r
   NULL,                       // HostBridgeHandle\r
-  0,                          // RootBridgeNumber\r
   {NULL, NULL},               // Head\r
   FALSE,                      // ResourceSubiteed\r
   TRUE,                       // CanRestarted\r
@@ -213,7 +212,6 @@ InitializePciHostBridge (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  HostBridge->RootBridgeNumber = 1;\r
   InitializeListHead (&HostBridge->Head);\r
 \r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
@@ -227,7 +225,7 @@ InitializePciHostBridge (
   }\r
 \r
   for (RootBridgeNumber = 0;\r
-       RootBridgeNumber < HostBridge->RootBridgeNumber;\r
+       RootBridgeNumber < 1;\r
        ++RootBridgeNumber) {\r
     Status = InitRootBridge (\r
                (UINT8)RootBridgeNumber,\r

diff --git a/OvmfPkg/PciHostBridgeDxe/PciHostBridge.h b/OvmfPkg/PciHostBridgeDxe/PciHostBridge.h
index d2c28bcd20b8f6f291bce769ceffc8a85eb71e4f..617c68e31847bab228a307bf56eb184984cb469b 100644 (file)
--- a/OvmfPkg/PciHostBridgeDxe/PciHostBridge.h
+++ b/OvmfPkg/PciHostBridgeDxe/PciHostBridge.h
@@ -52,7 +52,6 @@ typedef enum {
 typedef struct {\r
   UINTN                                             Signature;\r
   EFI_HANDLE                                        HostBridgeHandle;\r
-  UINTN                                             RootBridgeNumber;\r
   LIST_ENTRY                                        Head;\r
   BOOLEAN                                           ResourceSubmited;\r
   BOOLEAN                                           CanRestarted;\r