From 6c46498875b7f67b2e3edf5a4bdb4c34f529236f Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 14 Jul 2015 12:02:01 +0000 Subject: [PATCH] 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 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Regression-tested-by: Gabriel Somlo Reviewed-by: Jordan Justen git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17956 6f19259b-4bc3-4df7-8a09-765794883524 --- 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 33cf119814..985290928d 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] ); -- 2.39.5