Merge branch of PI tree to main trunk

[mirror_edk2.git] / MdeModulePkg / Core / Pei / Dependency / dependency.c

diff --git a/MdeModulePkg/Core/Pei/Dependency/dependency.c b/MdeModulePkg/Core/Pei/Dependency/dependency.c
index c817a3d1717ad722aa145496f44dffc565c860b1..7ea840d23a49daa65bbfde158f9df98fd38f13ae 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dependency/dependency.c
+++ b/MdeModulePkg/Core/Pei/Dependency/dependency.c
@@ -87,11 +87,10 @@ Returns:
 }\r
 \r
 \r
-EFI_STATUS\r
+BOOLEAN\r
 PeimDispatchReadiness (\r
   IN EFI_PEI_SERVICES   **PeiServices,\r
-  IN VOID               *DependencyExpression,\r
-  OUT BOOLEAN           *Runnable\r
+  IN VOID               *DependencyExpression\r
   )\r
 /*++\r
 \r
@@ -130,7 +129,6 @@ Returns:
   EVAL_STACK_ENTRY               EvalStack[MAX_GRAMMAR_SIZE];\r
 \r
   Iterator  = DependencyExpression;\r
-  *Runnable = FALSE;\r
 \r
   StackPtr = &EvalStack[0];\r
 \r
@@ -149,7 +147,7 @@ Returns:
         // EvalStack on the push\r
         //\r
         if (StackPtr > &EvalStack[MAX_GRAMMAR_SIZE-1]) {\r
-          return EFI_INVALID_PARAMETER;\r
+          return FALSE;\r
         }\r
 \r
         //\r
@@ -170,7 +168,7 @@ Returns:
         // did two POPs.\r
         //\r
         if (StackPtr < &EvalStack[2]) {\r
-          return EFI_INVALID_PARAMETER;\r
+          return FALSE;\r
         }\r
 \r
         //\r
@@ -208,10 +206,9 @@ Returns:
         // an error in the dependency grammar, so return EFI_INVALID_PARAMETER.\r
         //\r
         if (StackPtr != &EvalStack[0]) {\r
-          return EFI_INVALID_PARAMETER;\r
+          return FALSE;\r
         }\r
-        *Runnable = IsPpiInstalled (PeiServices, StackPtr);\r
-        return EFI_SUCCESS;\r
+        return IsPpiInstalled (PeiServices, StackPtr);\r
         break;\r
 \r
       case (EFI_DEP_NOT):    \r
@@ -222,7 +219,7 @@ Returns:
         // did a POP.\r
         //\r
         if (StackPtr < &EvalStack[1]) {\r
-          return EFI_INVALID_PARAMETER;\r
+          return FALSE;\r
         }\r
         (StackPtr-1)->Result = (BOOLEAN) !IsPpiInstalled (PeiServices, (StackPtr-1));\r
         (StackPtr-1)->Operator = NULL;\r
@@ -235,7 +232,7 @@ Returns:
         // EvalStack on the push\r
         //\r
         if (StackPtr > &EvalStack[MAX_GRAMMAR_SIZE-1]) {\r
-          return EFI_INVALID_PARAMETER;\r
+          return FALSE;\r
         }\r
         //\r
         // Iterator has increased by 1 after we retrieve the operand, so here we \r
@@ -255,7 +252,7 @@ Returns:
         //\r
         // The grammar should never arrive here\r
         //\r
-        return EFI_INVALID_PARAMETER;\r
+        return FALSE;\r
         break;\r
     }\r
   }\r