diff options
Diffstat (limited to 'source/components/dispatcher/dswload2.c')
| -rw-r--r-- | source/components/dispatcher/dswload2.c | 40 | 
1 files changed, 21 insertions, 19 deletions
| diff --git a/source/components/dispatcher/dswload2.c b/source/components/dispatcher/dswload2.c index f6095d971900..4c7392045b85 100644 --- a/source/components/dispatcher/dswload2.c +++ b/source/components/dispatcher/dswload2.c @@ -159,8 +159,8 @@ AcpiDsLoad2BeginOp (           * for use later.           */          Status = AcpiNsLookup (WalkState->ScopeInfo, BufferPtr, ObjectType, -                        ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT, -                        WalkState, &(Node)); +            ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT, +            WalkState, &(Node));          break;      case AML_SCOPE_OP: @@ -185,8 +185,8 @@ AcpiDsLoad2BeginOp (               * for use later.               */              Status = AcpiNsLookup (WalkState->ScopeInfo, BufferPtr, ObjectType, -                        ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT, -                        WalkState, &(Node)); +                ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT, +                WalkState, &(Node));              if (ACPI_FAILURE (Status))              {  #ifdef ACPI_ASL_COMPILER @@ -323,7 +323,7 @@ AcpiDsLoad2BeginOp (          /* Add new entry or lookup existing entry */          Status = AcpiNsLookup (WalkState->ScopeInfo, BufferPtr, ObjectType, -                    ACPI_IMODE_LOAD_PASS2, Flags, WalkState, &Node); +            ACPI_IMODE_LOAD_PASS2, Flags, WalkState, &Node);          if (ACPI_SUCCESS (Status) && (Flags & ACPI_NS_TEMPORARY))          { @@ -401,7 +401,7 @@ AcpiDsLoad2EndOp (      Op = WalkState->Op;      ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Opcode [%s] Op %p State %p\n", -            WalkState->OpInfo->Name, Op, WalkState)); +        WalkState->OpInfo->Name, Op, WalkState));      /* Check if opcode had an associated namespace object */ @@ -507,8 +507,8 @@ AcpiDsLoad2EndOp (          {          case AML_INDEX_FIELD_OP: -            Status = AcpiDsCreateIndexField (Op, (ACPI_HANDLE) Arg->Common.Node, -                        WalkState); +            Status = AcpiDsCreateIndexField ( +                Op, (ACPI_HANDLE) Arg->Common.Node, WalkState);              break;          case AML_BANK_FIELD_OP: @@ -593,7 +593,7 @@ AcpiDsLoad2EndOp (              if (Op->Common.AmlOpcode == AML_REGION_OP)              {                  RegionSpace = (ACPI_ADR_SPACE_TYPE) -                      ((Op->Common.Value.Arg)->Common.Value.Integer); +                    ((Op->Common.Value.Arg)->Common.Value.Integer);              }              else              { @@ -618,8 +618,8 @@ AcpiDsLoad2EndOp (                   * Executing a method: initialize the region and unlock                   * the interpreter                   */ -                Status = AcpiExCreateRegion (Op->Named.Data, Op->Named.Length, -                            RegionSpace, WalkState); +                Status = AcpiExCreateRegion (Op->Named.Data, +                    Op->Named.Length, RegionSpace, WalkState);                  if (ACPI_FAILURE (Status))                  {                      return_ACPI_STATUS (Status); @@ -628,8 +628,8 @@ AcpiDsLoad2EndOp (                  AcpiExExitInterpreter ();              } -            Status = AcpiEvInitializeRegion (AcpiNsGetAttachedObject (Node), -                        FALSE); +            Status = AcpiEvInitializeRegion ( +                AcpiNsGetAttachedObject (Node), FALSE);              if (WalkState->MethodNode)              {                  AcpiExEnterInterpreter (); @@ -672,12 +672,14 @@ AcpiDsLoad2EndOp (                  WalkState->Operands[0] = ACPI_CAST_PTR (void, Op->Named.Node);                  WalkState->NumOperands = 1; -                Status = AcpiDsCreateOperands (WalkState, Op->Common.Value.Arg); +                Status = AcpiDsCreateOperands ( +                    WalkState, Op->Common.Value.Arg);                  if (ACPI_SUCCESS (Status))                  { -                    Status = AcpiExCreateMethod (Op->Named.Data, -                                        Op->Named.Length, WalkState); +                    Status = AcpiExCreateMethod ( +                        Op->Named.Data, Op->Named.Length, WalkState);                  } +                  WalkState->Operands[0] = NULL;                  WalkState->NumOperands = 0; @@ -712,9 +714,9 @@ AcpiDsLoad2EndOp (           * Lookup the method name and save the Node           */          Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.String, -                        ACPI_TYPE_ANY, ACPI_IMODE_LOAD_PASS2, -                        ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, -                        WalkState, &(NewNode)); +            ACPI_TYPE_ANY, ACPI_IMODE_LOAD_PASS2, +            ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, +            WalkState, &(NewNode));          if (ACPI_SUCCESS (Status))          {              /* | 
