MdeModulePkg/PciHostBridge: Move declaration of mIoMmu to header file

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / PciHostBridgeDxe / PciHostBridge.c

diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
index 8b71363ea4e5018b50c065ff582eb101746f31df..a74c6f0d30b8b0b48fb67e02d05603cec890c096 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
+++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
@@ -2,7 +2,7 @@
 \r
   Provides the basic interfaces to abstract a PCI Host Bridge Resource Allocation.\r
 \r
-Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "PciRootBridge.h"\r
 #include "PciHostResource.h"\r
 \r
-\r
-EFI_METRONOME_ARCH_PROTOCOL *mMetronome;\r
 EFI_CPU_IO2_PROTOCOL        *mCpuIo;\r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED CHAR16 *mAcpiAddressSpaceTypeStr[] = {\r
@@ -28,7 +26,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CHAR16 *mPciResourceTypeStr[] = {
   L"I/O", L"Mem", L"PMem", L"Mem64", L"PMem64", L"Bus"\r
 };\r
 \r
-EDKII_IOMMU_PROTOCOL        *mIoMmuProtocol;\r
+EDKII_IOMMU_PROTOCOL        *mIoMmu;\r
 EFI_EVENT                   mIoMmuEvent;\r
 VOID                        *mIoMmuRegistration;\r
 \r
@@ -365,7 +363,7 @@ IoMmuProtocolCallback (
 {\r
   EFI_STATUS   Status;\r
 \r
-  Status = gBS->LocateProtocol (&gEdkiiIoMmuProtocolGuid, NULL, (VOID **)&mIoMmuProtocol);\r
+  Status = gBS->LocateProtocol (&gEdkiiIoMmuProtocolGuid, NULL, (VOID **)&mIoMmu);\r
   if (!EFI_ERROR(Status)) {\r
     gBS->CloseEvent (mIoMmuEvent);\r
   }\r
@@ -406,8 +404,6 @@ InitializePciHostBridge (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Status = gBS->LocateProtocol (&gEfiMetronomeArchProtocolGuid, NULL, (VOID **) &mMetronome);\r
-  ASSERT_EFI_ERROR (Status);\r
   Status = gBS->LocateProtocol (&gEfiCpuIo2ProtocolGuid, NULL, (VOID **) &mCpuIo);\r
   ASSERT_EFI_ERROR (Status);\r
 \r