1 files changed, 118 insertions, 139 deletions

diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index 362802ae29a2..0a08d2f04a06 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -41,31 +41,22 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
 
 #define _COMPONENT          ACPI_NAMESPACE
-         ACPI_MODULE_NAME    ("nsinit")
+ACPI_MODULE_NAME("nsinit")
 
 /* Local prototypes */
-
 static acpi_status
-acpi_ns_init_one_object (
-        acpi_handle                     obj_handle,
-        u32                             level,
-        void                            *context,
-        void                            **return_value);
+acpi_ns_init_one_object(acpi_handle obj_handle,
+                        u32 level, void *context, void **return_value);
 
 static acpi_status
-acpi_ns_init_one_device (
-        acpi_handle                     obj_handle,
-        u32                             nesting_level,
-        void                            *context,
-        void                            **return_value);
-
+acpi_ns_init_one_device(acpi_handle obj_handle,
+                        u32 nesting_level, void *context, void **return_value);
 
 /*******************************************************************************
  *
@@ -80,52 +71,48 @@ acpi_ns_init_one_device (
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ns_initialize_objects (
-        void)
+acpi_status acpi_ns_initialize_objects(void)
 {
-        acpi_status                     status;
-        struct acpi_init_walk_info      info;
-
+        acpi_status status;
+        struct acpi_init_walk_info info;
 
-        ACPI_FUNCTION_TRACE ("ns_initialize_objects");
+        ACPI_FUNCTION_TRACE("ns_initialize_objects");
 
-
-        ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
-                "**** Starting initialization of namespace objects ****\n"));
-        ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
-                "Completing Region/Field/Buffer/Package initialization:"));
+        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                          "**** Starting initialization of namespace objects ****\n"));
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
+                              "Completing Region/Field/Buffer/Package initialization:"));
 
         /* Set all init info to zero */
 
-        ACPI_MEMSET (&info, 0, sizeof (struct acpi_init_walk_info));
+        ACPI_MEMSET(&info, 0, sizeof(struct acpi_init_walk_info));
 
         /* Walk entire namespace from the supplied root */
 
-        status = acpi_walk_namespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
-                          ACPI_UINT32_MAX, acpi_ns_init_one_object,
-                          &info, NULL);
-        if (ACPI_FAILURE (status)) {
-                ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "walk_namespace failed! %s\n",
-                        acpi_format_exception (status)));
+        status = acpi_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
+                                     ACPI_UINT32_MAX, acpi_ns_init_one_object,
+                                     &info, NULL);
+        if (ACPI_FAILURE(status)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed! %s\n",
+                                  acpi_format_exception(status)));
         }
 
-        ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
-                "\nInitialized %hd/%hd Regions %hd/%hd Fields %hd/%hd Buffers %hd/%hd Packages (%hd nodes)\n",
-                info.op_region_init, info.op_region_count,
-                info.field_init,    info.field_count,
-                info.buffer_init,   info.buffer_count,
-                info.package_init,  info.package_count, info.object_count));
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
+                              "\nInitialized %hd/%hd Regions %hd/%hd Fields %hd/%hd Buffers %hd/%hd Packages (%hd nodes)\n",
+                              info.op_region_init, info.op_region_count,
+                              info.field_init, info.field_count,
+                              info.buffer_init, info.buffer_count,
+                              info.package_init, info.package_count,
+                              info.object_count));
 
-        ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
-                "%hd Control Methods found\n", info.method_count));
-        ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
-                "%hd Op Regions found\n", info.op_region_count));
+        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                          "%hd Control Methods found\n", info.method_count));
+        ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
+                          "%hd Op Regions found\n", info.op_region_count));
 
-        return_ACPI_STATUS (AE_OK);
+        return_ACPI_STATUS(AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_initialize_devices
@@ -142,16 +129,12 @@ acpi_ns_initialize_objects (
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ns_initialize_devices (
-        void)
+acpi_status acpi_ns_initialize_devices(void)
 {
-        acpi_status                     status;
-        struct acpi_device_walk_info    info;
-
-
-        ACPI_FUNCTION_TRACE ("ns_initialize_devices");
+        acpi_status status;
+        struct acpi_device_walk_info info;
 
+        ACPI_FUNCTION_TRACE("ns_initialize_devices");
 
         /* Init counters */
 
@@ -159,34 +142,34 @@ acpi_ns_initialize_devices (
         info.num_STA = 0;
         info.num_INI = 0;
 
-        ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
-                "Executing all Device _STA and_INI methods:"));
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
+                              "Executing all Device _STA and_INI methods:"));
 
-        status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
-        if (ACPI_FAILURE (status)) {
-                return_ACPI_STATUS (status);
+        status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
         }
 
         /* Walk namespace for all objects */
 
-        status = acpi_ns_walk_namespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
-                          ACPI_UINT32_MAX, TRUE, acpi_ns_init_one_device, &info, NULL);
+        status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
+                                        ACPI_UINT32_MAX, TRUE,
+                                        acpi_ns_init_one_device, &info, NULL);
 
-        (void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
 
-        if (ACPI_FAILURE (status)) {
-                ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "walk_namespace failed! %s\n",
-                        acpi_format_exception (status)));
+        if (ACPI_FAILURE(status)) {
+                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "walk_namespace failed! %s\n",
+                                  acpi_format_exception(status)));
         }
 
-        ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
-                "\n%hd Devices found containing: %hd _STA, %hd _INI methods\n",
-                info.device_count, info.num_STA, info.num_INI));
+        ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT,
+                              "\n%hd Devices found containing: %hd _STA, %hd _INI methods\n",
+                              info.device_count, info.num_STA, info.num_INI));
 
-        return_ACPI_STATUS (status);
+        return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_init_one_object
@@ -208,28 +191,25 @@ acpi_ns_initialize_devices (
  ******************************************************************************/
 
 static acpi_status
-acpi_ns_init_one_object (
-        acpi_handle                     obj_handle,
-        u32                             level,
-        void                            *context,
-        void                            **return_value)
+acpi_ns_init_one_object(acpi_handle obj_handle,
+                        u32 level, void *context, void **return_value)
 {
-        acpi_object_type                type;
-        acpi_status                     status;
-        struct acpi_init_walk_info      *info = (struct acpi_init_walk_info *) context;
-        struct acpi_namespace_node      *node = (struct acpi_namespace_node *) obj_handle;
-        union acpi_operand_object       *obj_desc;
-
-
-        ACPI_FUNCTION_NAME ("ns_init_one_object");
+        acpi_object_type type;
+        acpi_status status;
+        struct acpi_init_walk_info *info =
+            (struct acpi_init_walk_info *)context;
+        struct acpi_namespace_node *node =
+            (struct acpi_namespace_node *)obj_handle;
+        union acpi_operand_object *obj_desc;
 
+        ACPI_FUNCTION_NAME("ns_init_one_object");
 
         info->object_count++;
 
         /* And even then, we are only interested in a few object types */
 
-        type = acpi_ns_get_type (obj_handle);
-        obj_desc = acpi_ns_get_attached_object (node);
+        type = acpi_ns_get_type(obj_handle);
+        obj_desc = acpi_ns_get_attached_object(node);
         if (!obj_desc) {
                 return (AE_OK);
         }
@@ -269,8 +249,8 @@ acpi_ns_init_one_object (
         /*
          * Must lock the interpreter before executing AML code
          */
-        status = acpi_ex_enter_interpreter ();
-        if (ACPI_FAILURE (status)) {
+        status = acpi_ex_enter_interpreter();
+        if (ACPI_FAILURE(status)) {
                 return (status);
         }
 
@@ -282,25 +262,25 @@ acpi_ns_init_one_object (
         case ACPI_TYPE_REGION:
 
                 info->op_region_init++;
-                status = acpi_ds_get_region_arguments (obj_desc);
+                status = acpi_ds_get_region_arguments(obj_desc);
                 break;
 
         case ACPI_TYPE_BUFFER_FIELD:
 
                 info->field_init++;
-                status = acpi_ds_get_buffer_field_arguments (obj_desc);
+                status = acpi_ds_get_buffer_field_arguments(obj_desc);
                 break;
 
         case ACPI_TYPE_BUFFER:
 
                 info->buffer_init++;
-                status = acpi_ds_get_buffer_arguments (obj_desc);
+                status = acpi_ds_get_buffer_arguments(obj_desc);
                 break;
 
         case ACPI_TYPE_PACKAGE:
 
                 info->package_init++;
-                status = acpi_ds_get_package_arguments (obj_desc);
+                status = acpi_ds_get_package_arguments(obj_desc);
                 break;
 
         default:
@@ -308,12 +288,13 @@ acpi_ns_init_one_object (
                 break;
         }
 
-        if (ACPI_FAILURE (status)) {
-                ACPI_DEBUG_PRINT_RAW ((ACPI_DB_ERROR, "\n"));
-                ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                "Could not execute arguments for [%4.4s] (%s), %s\n",
-                                acpi_ut_get_node_name (node), acpi_ut_get_type_name (type),
-                                acpi_format_exception (status)));
+        if (ACPI_FAILURE(status)) {
+                ACPI_DEBUG_PRINT_RAW((ACPI_DB_ERROR, "\n"));
+                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                  "Could not execute arguments for [%4.4s] (%s), %s\n",
+                                  acpi_ut_get_node_name(node),
+                                  acpi_ut_get_type_name(type),
+                                  acpi_format_exception(status)));
         }
 
         /*
@@ -321,18 +302,17 @@ acpi_ns_init_one_object (
          * pathname
          */
         if (!(acpi_dbg_level & ACPI_LV_INIT_NAMES)) {
-                ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT, "."));
+                ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "."));
         }
 
         /*
          * We ignore errors from above, and always return OK, since we don't want
          * to abort the walk on any single error.
          */
-        acpi_ex_exit_interpreter ();
+        acpi_ex_exit_interpreter();
         return (AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_init_one_device
@@ -348,41 +328,37 @@ acpi_ns_init_one_object (
  ******************************************************************************/
 
 static acpi_status
-acpi_ns_init_one_device (
-        acpi_handle                     obj_handle,
-        u32                             nesting_level,
-        void                            *context,
-        void                            **return_value)
+acpi_ns_init_one_device(acpi_handle obj_handle,
+                        u32 nesting_level, void *context, void **return_value)
 {
-        struct acpi_device_walk_info   *info = (struct acpi_device_walk_info *) context;
-        struct acpi_parameter_info      pinfo;
-        u32                             flags;
-        acpi_status                     status;
-
-
-        ACPI_FUNCTION_TRACE ("ns_init_one_device");
+        struct acpi_device_walk_info *info =
+            (struct acpi_device_walk_info *)context;
+        struct acpi_parameter_info pinfo;
+        u32 flags;
+        acpi_status status;
 
+        ACPI_FUNCTION_TRACE("ns_init_one_device");
 
         pinfo.parameters = NULL;
         pinfo.parameter_type = ACPI_PARAM_ARGS;
 
-        pinfo.node = acpi_ns_map_handle_to_node (obj_handle);
+        pinfo.node = acpi_ns_map_handle_to_node(obj_handle);
         if (!pinfo.node) {
-                return_ACPI_STATUS (AE_BAD_PARAMETER);
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
         /*
          * We will run _STA/_INI on Devices, Processors and thermal_zones only
          */
-        if ((pinfo.node->type != ACPI_TYPE_DEVICE)      &&
-                (pinfo.node->type != ACPI_TYPE_PROCESSOR)   &&
-                (pinfo.node->type != ACPI_TYPE_THERMAL)) {
-                return_ACPI_STATUS (AE_OK);
+        if ((pinfo.node->type != ACPI_TYPE_DEVICE) &&
+            (pinfo.node->type != ACPI_TYPE_PROCESSOR) &&
+            (pinfo.node->type != ACPI_TYPE_THERMAL)) {
+                return_ACPI_STATUS(AE_OK);
         }
 
         if ((acpi_dbg_level <= ACPI_LV_ALL_EXCEPTIONS) &&
-                (!(acpi_dbg_level & ACPI_LV_INFO))) {
-                ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT, "."));
+            (!(acpi_dbg_level & ACPI_LV_INFO))) {
+                ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "."));
         }
 
         info->device_count++;
@@ -390,20 +366,20 @@ acpi_ns_init_one_device (
         /*
          * Run _STA to determine if we can run _INI on the device.
          */
-        ACPI_DEBUG_EXEC (acpi_ut_display_init_pathname (ACPI_TYPE_METHOD,
-                           pinfo.node, METHOD_NAME__STA));
-        status = acpi_ut_execute_STA (pinfo.node, &flags);
+        ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname(ACPI_TYPE_METHOD,
+                                                      pinfo.node,
+                                                      METHOD_NAME__STA));
+        status = acpi_ut_execute_STA(pinfo.node, &flags);
 
-        if (ACPI_FAILURE (status)) {
+        if (ACPI_FAILURE(status)) {
                 if (pinfo.node->type == ACPI_TYPE_DEVICE) {
                         /* Ignore error and move on to next device */
 
-                        return_ACPI_STATUS (AE_OK);
+                        return_ACPI_STATUS(AE_OK);
                 }
 
                 /* _STA is not required for Processor or thermal_zone objects */
-        }
-        else {
+        } else {
                 info->num_STA++;
 
                 if (!(flags & 0x01)) {
@@ -416,32 +392,34 @@ acpi_ns_init_one_device (
         /*
          * The device is present. Run _INI.
          */
-        ACPI_DEBUG_EXEC (acpi_ut_display_init_pathname (ACPI_TYPE_METHOD,
-                           pinfo.node, METHOD_NAME__INI));
-        status = acpi_ns_evaluate_relative (METHOD_NAME__INI, &pinfo);
-        if (ACPI_FAILURE (status)) {
+        ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname(ACPI_TYPE_METHOD,
+                                                      pinfo.node,
+                                                      METHOD_NAME__INI));
+        status = acpi_ns_evaluate_relative(METHOD_NAME__INI, &pinfo);
+        if (ACPI_FAILURE(status)) {
                 /* No _INI (AE_NOT_FOUND) means device requires no initialization */
 
                 if (status != AE_NOT_FOUND) {
                         /* Ignore error and move on to next device */
 
 #ifdef ACPI_DEBUG_OUTPUT
-                        char                *scope_name = acpi_ns_get_external_pathname (pinfo.node);
+                        char *scope_name =
+                            acpi_ns_get_external_pathname(pinfo.node);
 
-                        ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "%s._INI failed: %s\n",
-                                        scope_name, acpi_format_exception (status)));
+                        ACPI_DEBUG_PRINT((ACPI_DB_WARN, "%s._INI failed: %s\n",
+                                          scope_name,
+                                          acpi_format_exception(status)));
 
-                        ACPI_MEM_FREE (scope_name);
+                        ACPI_MEM_FREE(scope_name);
 #endif
                 }
 
                 status = AE_OK;
-        }
-        else {
+        } else {
                 /* Delete any return object (especially if implicit_return is enabled) */
 
                 if (pinfo.return_object) {
-                        acpi_ut_remove_reference (pinfo.return_object);
+                        acpi_ut_remove_reference(pinfo.return_object);
                 }
 
                 /* Count of successful INIs */
@@ -452,8 +430,9 @@ acpi_ns_init_one_device (
         if (acpi_gbl_init_handler) {
                 /* External initialization handler is present, call it */
 
-                status = acpi_gbl_init_handler (pinfo.node, ACPI_INIT_DEVICE_INI);
+                status =
+                    acpi_gbl_init_handler(pinfo.node, ACPI_INIT_DEVICE_INI);
         }
 
-        return_ACPI_STATUS (status);
+        return_ACPI_STATUS(status);
 }