There is no need to store these constants in dedicated static storage
duration objects; we can simply open-code them, simplifying the code.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <ler...@redhat.com>
Regression-tested-by: Gabriel Somlo <so...@cmu.edu>
---
 OvmfPkg/PciHostBridgeDxe/PciHostBridge.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/OvmfPkg/PciHostBridgeDxe/PciHostBridge.c 
b/OvmfPkg/PciHostBridgeDxe/PciHostBridge.c
index 33cf119..9852909 100644
--- a/OvmfPkg/PciHostBridgeDxe/PciHostBridge.c
+++ b/OvmfPkg/PciHostBridgeDxe/PciHostBridge.c
@@ -18,16 +18,9 @@
 #include "PciHostBridge.h"
 
 //
-// Hard code: Root Bridge Number within the host bridge
-//            Root Bridge's attribute
-//            Root Bridge's device path
+// Hard code: Root Bridge's device path
 //            Root Bridge's resource aperture
 //
-UINTN RootBridgeNumber = 1;
-
-UINT64 RootBridgeAttribute[1] = {
-  EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM
-};
 
 EFI_PCI_ROOT_BRIDGE_DEVICE_PATH mEfiPciRootBridgeDevicePath[1] = {
   {
@@ -117,7 +110,7 @@ InitializePciHostBridge (
     return EFI_OUT_OF_RESOURCES;
   }
 
-  HostBridge->RootBridgeNumber = RootBridgeNumber;
+  HostBridge->RootBridgeNumber = 1;
   InitializeListHead (&HostBridge->Head);
 
   Status = gBS->InstallMultipleProtocolInterfaces (
@@ -148,7 +141,7 @@ InitializePciHostBridge (
     RootBridgeConstructor (
       &PrivateData->Io,
       HostBridge->HostBridgeHandle,
-      RootBridgeAttribute[Loop2],
+      EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM,
       &mResAperture[Loop2]
       );
 
-- 
1.8.3.1



------------------------------------------------------------------------------
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel

Reply via email to