OvmfPkg: PciHostBridgeDxe: kill RootBridgeNumber and RootBridgeAttribute

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

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@17956 6f19259b-4bc3-4df7-8a09-765794883524

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