2 files changed, 3 insertions, 15 deletions
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
index f82842cac1..0e16f9850e 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c
@@ -15,12 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "HiiDatabase.h"
 
-//
-// Global variables
-//
-EFI_GUID mHiiDatabaseNotifyGuid = HII_DATABASE_NOTIFY_GUID;
-
-
 /**
   This function generates a HII_DATABASE_RECORD node and adds into hii database.
   This is a internal function.
@@ -3419,7 +3413,7 @@ HiiRegisterPackageNotify (
   //
   Status = gBS->InstallMultipleProtocolInterfaces (
                   &Notify->NotifyHandle,
-                  &mHiiDatabaseNotifyGuid,
+                  &gEfiCallerIdGuid,
                   NULL,
                   NULL
                   );
@@ -3477,7 +3471,7 @@ HiiUnregisterPackageNotify (
 
   Status = gBS->OpenProtocol (
                   NotificationHandle,
-                  &mHiiDatabaseNotifyGuid,
+                  &gEfiCallerIdGuid,
                   NULL,
                   NULL,
                   NULL,
@@ -3498,7 +3492,7 @@ HiiUnregisterPackageNotify (
       RemoveEntryList (&Notify->DatabaseNotifyEntry);
       Status = gBS->UninstallMultipleProtocolInterfaces (
                       Notify->NotifyHandle,
-                      &mHiiDatabaseNotifyGuid,
+                      &gEfiCallerIdGuid,
                       NULL,
                       NULL
                       );
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index 1f6b888ec5..783fc7ecc1 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -42,12 +42,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/PrintLib.h>
 
-
-#define HII_DATABASE_NOTIFY_GUID \
-  { \
-    0xc1c76, 0xd79e, 0x42fe, {0x86, 0xb, 0x8b, 0xe8, 0x7b, 0x3e, 0x7a, 0x78} \
-  }
-
 #define MAX_STRING_LENGTH                  1024
 #define MAX_FONT_NAME_LEN                  256
 #define NARROW_BASELINE                    15