MFC: r284583, r285797, r285799, r287168, r298714, r298720, r298838,

	r300879

Merge ACPICA up to 20160527.

Requested by:	mav

1 files changed, 10 insertions, 9 deletions

diff --git a/sys/contrib/dev/acpica/components/utilities/utresrc.c b/sys/contrib/dev/acpica/components/utilities/utresrc.c
index 65b23f1..72ebf65 100644
--- a/sys/contrib/dev/acpica/components/utilities/utresrc.c
+++ b/sys/contrib/dev/acpica/components/utilities/utresrc.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -489,8 +489,8 @@ AcpiUtWalkAmlResources (
         if (ACPI_FAILURE (Status))
         {
             /*
-             * Exit on failure. Cannot continue because the descriptor length
-             * may be bogus also.
+             * Exit on failure. Cannot continue because the descriptor
+             * length may be bogus also.
              */
             return_ACPI_STATUS (Status);
         }
@@ -503,7 +503,8 @@ AcpiUtWalkAmlResources (
 
         if (UserFunction)
         {
-            Status = UserFunction (Aml, Length, Offset, ResourceIndex, Context);
+            Status = UserFunction (
+                Aml, Length, Offset, ResourceIndex, Context);
             if (ACPI_FAILURE (Status))
             {
                 return_ACPI_STATUS (Status);
@@ -625,8 +626,8 @@ AcpiUtValidateResource (
     }
 
     /*
-     * Check validity of the resource type, via AcpiGbl_ResourceTypes. Zero
-     * indicates an invalid resource.
+     * Check validity of the resource type, via AcpiGbl_ResourceTypes.
+     * Zero indicates an invalid resource.
      */
     if (!AcpiGbl_ResourceTypes[ResourceIndex])
     {
@@ -813,7 +814,7 @@ AcpiUtGetResourceLength (
         /* Small Resource type -- bits 2:0 of byte 0 contain the length */
 
         ResourceLength = (UINT16) (ACPI_GET8 (Aml) &
-                                    ACPI_RESOURCE_NAME_SMALL_LENGTH_MASK);
+            ACPI_RESOURCE_NAME_SMALL_LENGTH_MASK);
     }
 
     return (ResourceLength);
@@ -878,7 +879,7 @@ AcpiUtGetDescriptorLength (
      * the header length (depends on if this is a small or large resource)
      */
     return (AcpiUtGetResourceLength (Aml) +
-            AcpiUtGetResourceHeaderLength (Aml));
+        AcpiUtGetResourceHeaderLength (Aml));
 }
 
 
@@ -918,7 +919,7 @@ AcpiUtGetResourceEndTag (
     /* Validate the template and get a pointer to the EndTag */
 
     Status = AcpiUtWalkAmlResources (NULL, ObjDesc->Buffer.Pointer,
-                ObjDesc->Buffer.Length, NULL, (void **) EndTag);
+        ObjDesc->Buffer.Length, NULL, (void **) EndTag);
 
     return_ACPI_STATUS (Status);
 }