return value not follow spec.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8028 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 14 insertions, 11 deletions

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
index b1d4fa2fdb..cc4ce812f1 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
@@ -665,7 +665,6 @@ Exit:
   

     @retval EFI_SUCCESS             - The notification function was unregistered successfully.

     @retval EFI_INVALID_PARAMETER   - The NotificationHandle is invalid.

-    @retval EFI_NOT_FOUND           - Can not find the matching entry in database.  

                               

 **/   

 EFI_STATUS

@@ -718,7 +717,7 @@ KeyboardUnregisterKeyNotify (
   //

   // Can not find the specified Notification Handle

   //

-  Status = EFI_NOT_FOUND;

+  Status = EFI_INVALID_PARAMETER;

 Exit:

   //

   // Leave critical section and return

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
index e2c86b07b4..7ff7f1ca67 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
@@ -1084,7 +1084,6 @@ USBKeyboardRegisterKeyNotify (
 

   @retval EFI_SUCCESS              The notification function was unregistered successfully.

   @retval EFI_INVALID_PARAMETER    The NotificationHandle is invalid

-  @retval EFI_NOT_FOUND            Cannot find the matching entry in database.

 

 **/

 EFI_STATUS

@@ -1133,6 +1132,9 @@ USBKeyboardUnregisterKeyNotify (
     }

   }

 

-  return EFI_NOT_FOUND;  

+  //

+  // Cannot find the matching entry in database.

+  //

+  return EFI_INVALID_PARAMETER;  

 }

 

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 27fa58f815..3389f62f98 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -3666,7 +3666,6 @@ ConSplitterTextInRegisterKeyNotify (
   @retval EFI_SUCCESS              The notification function was unregistered

                                    successfully.

   @retval EFI_INVALID_PARAMETER    The NotificationHandle is invalid.

-  @retval EFI_NOT_FOUND            Can not find the matching entry in database.

 

 **/

 EFI_STATUS

@@ -3720,8 +3719,10 @@ ConSplitterTextInUnregisterKeyNotify (
     }

   }

 

-  return EFI_NOT_FOUND;

-

+  //

+  // NotificationHandle is not found in database

+  //

+  return EFI_INVALID_PARAMETER;

 }

 

 

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
index 44b62d7aed..d8305724b8 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
@@ -426,7 +426,6 @@ TerminalConInRegisterKeyNotify (
   @retval EFI_SUCCESS              The notification function was unregistered

                                    successfully.

   @retval EFI_INVALID_PARAMETER    The NotificationHandle is invalid.

-  @retval EFI_NOT_FOUND            Can not find the matching entry in database.

 

 **/

 EFI_STATUS

@@ -470,7 +469,10 @@ TerminalConInUnregisterKeyNotify (
     }

   }

 

-  return EFI_NOT_FOUND;

+  //

+  // Can not find the matching entry in database.

+  //

+  return EFI_INVALID_PARAMETER;

 }

 

 /**

diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
index e9866740ce..ccf75f5fce 100644
--- a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
@@ -786,7 +786,6 @@ WinNtGopSimpleTextInExUnregisterKeyNotify (
   Returns:

     EFI_SUCCESS             - The notification function was unregistered successfully.

     EFI_INVALID_PARAMETER   - The NotificationHandle is invalid.

-    EFI_NOT_FOUND           - Can not find the matching entry in database.  

                               

 --*/   

 {

@@ -825,7 +824,7 @@ WinNtGopSimpleTextInExUnregisterKeyNotify (
   //

   // Can not find the specified Notification Handle

   //

-  return EFI_NOT_FOUND;

+  return EFI_INVALID_PARAMETER;

 }

 

 /**