From c3b6d97563982940a2af26671c371998684a2fd9 Mon Sep 17 00:00:00 2001
From: Olivier Martin <olivier.martin@arm.com>
Date: Fri, 1 Aug 2014 18:33:17 +0000
Subject: ArmPlatformPkg: Removed the global ImageHandle when
 UefiBootServicesTableLib is included

UefiBootServicesTableLib already defines gImageHandle that has been initialized with
the value of ImageHandle.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15737 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../FileSystem/BootMonFs/BootMonFsEntryPoint.c         | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'ArmPlatformPkg/FileSystem')

diff --git a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsEntryPoint.c b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsEntryPoint.c
index 00f7c077ea..5eb7afca7c 100644
--- a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsEntryPoint.c
+++ b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsEntryPoint.c
@@ -24,7 +24,6 @@
 #include "BootMonFsInternal.h"
 
 EFI_DEVICE_PATH* mBootMonFsSupportedDevicePaths;
-EFI_HANDLE       mImageHandle;
 LIST_ENTRY       mInstances;
 
 EFI_FILE_PROTOCOL mBootMonFsRootTemplate = {
@@ -217,7 +216,7 @@ BootMonFsDriverSupported (
                   ControllerHandle,
                   &gEfiDiskIoProtocolGuid,
                   (VOID **) &DiskIo,
-                  mImageHandle,
+                  gImageHandle,
                   ControllerHandle,
                   EFI_OPEN_PROTOCOL_BY_DRIVER
                   );
@@ -231,7 +230,7 @@ BootMonFsDriverSupported (
   gBS->CloseProtocol (
          ControllerHandle,
          &gEfiDiskIoProtocolGuid,
-         mImageHandle,
+         gImageHandle,
          ControllerHandle
          );
 
@@ -240,7 +239,7 @@ BootMonFsDriverSupported (
                   ControllerHandle,
                   &gEfiBlockIoProtocolGuid,
                   NULL,
-                  mImageHandle,
+                  gImageHandle,
                   ControllerHandle,
                   EFI_OPEN_PROTOCOL_TEST_PROTOCOL
                   );
@@ -253,7 +252,7 @@ BootMonFsDriverSupported (
                   ControllerHandle,
                   &gEfiDevicePathProtocolGuid,
                   (VOID **)&DevicePathProtocol,
-                  mImageHandle,
+                  gImageHandle,
                   ControllerHandle,
                   EFI_OPEN_PROTOCOL_BY_DRIVER
                   );
@@ -277,7 +276,7 @@ BootMonFsDriverSupported (
     }
   }
 
-  gBS->CloseProtocol (ControllerHandle, &gEfiDevicePathProtocolGuid, mImageHandle, ControllerHandle);
+  gBS->CloseProtocol (ControllerHandle, &gEfiDevicePathProtocolGuid, gImageHandle, ControllerHandle);
   return Status;
 }
 
@@ -303,7 +302,7 @@ BootMonFsDriverStart (
                   ControllerHandle,
                   &gEfiBlockIoProtocolGuid,
                   (VOID **)&(Instance->BlockIo),
-                  mImageHandle,
+                  gImageHandle,
                   ControllerHandle,
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL
                   );
@@ -316,7 +315,7 @@ BootMonFsDriverStart (
                   ControllerHandle,
                   &gEfiDiskIoProtocolGuid,
                   (VOID **)&(Instance->DiskIo),
-                  mImageHandle,
+                  gImageHandle,
                   ControllerHandle,
                   EFI_OPEN_PROTOCOL_BY_DRIVER
                   );
@@ -360,7 +359,7 @@ BootMonFsDriverStart (
                   ControllerHandle,
                   &gEfiDevicePathProtocolGuid,
                   (VOID **)&(Instance->DevicePath),
-                  mImageHandle,
+                  gImageHandle,
                   ControllerHandle,
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL
                   );
@@ -459,7 +458,6 @@ BootMonFsEntryPoint (
 {
   EFI_STATUS  Status;
 
-  mImageHandle = ImageHandle;
   InitializeListHead (&mInstances);
 
   // Initialize the list of Device Paths that could support BootMonFs
-- 
cgit v1.2.3