Pull asus into release branch
authorLen Brown <len.brown@intel.com>
Thu, 10 May 2007 06:50:01 +0000 (02:50 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 10 May 2007 06:50:01 +0000 (02:50 -0400)
64 files changed:
drivers/acpi/dispatcher/dsmethod.c
drivers/acpi/dispatcher/dsopcode.c
drivers/acpi/dispatcher/dsutils.c
drivers/acpi/dispatcher/dswstate.c
drivers/acpi/events/evgpe.c
drivers/acpi/events/evgpeblk.c
drivers/acpi/events/evmisc.c
drivers/acpi/events/evregion.c
drivers/acpi/events/evrgnini.c
drivers/acpi/events/evxface.c
drivers/acpi/events/evxfevnt.c
drivers/acpi/executer/exconvrt.c
drivers/acpi/executer/excreate.c
drivers/acpi/executer/exdump.c
drivers/acpi/executer/exmutex.c
drivers/acpi/executer/exnames.c
drivers/acpi/executer/exprep.c
drivers/acpi/executer/exresop.c
drivers/acpi/executer/exsystem.c
drivers/acpi/executer/exutils.c
drivers/acpi/hardware/hwsleep.c
drivers/acpi/namespace/nseval.c
drivers/acpi/namespace/nsinit.c
drivers/acpi/namespace/nswalk.c
drivers/acpi/namespace/nsxfeval.c
drivers/acpi/osl.c
drivers/acpi/parser/psopcode.c
drivers/acpi/resources/rscalc.c
drivers/acpi/resources/rscreate.c
drivers/acpi/resources/rsdump.c
drivers/acpi/resources/rsinfo.c
drivers/acpi/resources/rslist.c
drivers/acpi/resources/rsmisc.c
drivers/acpi/resources/rsutils.c
drivers/acpi/resources/rsxface.c
drivers/acpi/sleep/main.c
drivers/acpi/sleep/proc.c
drivers/acpi/tables/tbfadt.c
drivers/acpi/tables/tbxface.c
drivers/acpi/thermal.c
drivers/acpi/utilities/utalloc.c
drivers/acpi/utilities/utcache.c
drivers/acpi/utilities/utcopy.c
drivers/acpi/utilities/utdebug.c
drivers/acpi/utilities/utdelete.c
drivers/acpi/utilities/utglobal.c
drivers/acpi/utilities/utmisc.c
drivers/acpi/utilities/utmutex.c
drivers/acpi/utilities/utresrc.c
drivers/acpi/utilities/utxface.c
include/acpi/acdispat.h
include/acpi/acglobal.h
include/acpi/acinterp.h
include/acpi/aclocal.h
include/acpi/acnamesp.h
include/acpi/acobject.h
include/acpi/acpi_bus.h
include/acpi/acpi_drivers.h
include/acpi/acpi_numa.h
include/acpi/acpiosxf.h
include/acpi/actypes.h
include/acpi/acutils.h
include/acpi/platform/aclinux.h
include/acpi/processor.h

index 1683e5c5b94c5febc942d191489f0f30634cbe04..1cbe6190582494ed9f3557c58a17b659644f4979 100644 (file)
@@ -231,8 +231,10 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
                 * Obtain the method mutex if necessary. Do not acquire mutex for a
                 * recursive call.
                 */
-               if (acpi_os_get_thread_id() !=
-                   obj_desc->method.mutex->mutex.owner_thread_id) {
+               if (!walk_state ||
+                   !obj_desc->method.mutex->mutex.owner_thread ||
+                   (walk_state->thread !=
+                    obj_desc->method.mutex->mutex.owner_thread)) {
                        /*
                         * Acquire the method mutex. This releases the interpreter if we
                         * block (and reacquires it before it returns)
@@ -246,14 +248,14 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node,
                        }
 
                        /* Update the mutex and walk info and save the original sync_level */
-                       obj_desc->method.mutex->mutex.owner_thread_id =
-                               acpi_os_get_thread_id();
 
                        if (walk_state) {
                                obj_desc->method.mutex->mutex.
                                    original_sync_level =
                                    walk_state->thread->current_sync_level;
 
+                               obj_desc->method.mutex->mutex.owner_thread =
+                                   walk_state->thread;
                                walk_state->thread->current_sync_level =
                                    obj_desc->method.sync_level;
                        } else {
@@ -567,7 +569,7 @@ acpi_ds_terminate_control_method(union acpi_operand_object *method_desc,
 
                        acpi_os_release_mutex(method_desc->method.mutex->mutex.
                                              os_mutex);
-                       method_desc->method.mutex->mutex.owner_thread_id = ACPI_MUTEX_NOT_ACQUIRED;
+                       method_desc->method.mutex->mutex.owner_thread = NULL;
                }
        }
 
index 6c6104a7a247ef6413ed817ea34c24edfaf96dda..fc9da4879cbfb932e3b2e8ea683b12835d2391ad 100644 (file)
@@ -866,8 +866,7 @@ acpi_ds_eval_data_object_operands(struct acpi_walk_state *walk_state,
                    ((op->common.parent->common.aml_opcode != AML_PACKAGE_OP) &&
                     (op->common.parent->common.aml_opcode !=
                      AML_VAR_PACKAGE_OP)
-                    && (op->common.parent->common.aml_opcode !=
-                        AML_NAME_OP))) {
+                    && (op->common.parent->common.aml_opcode != AML_NAME_OP))) {
                        walk_state->result_obj = obj_desc;
                }
        }
index e4073e05a75ca1475bc39c03c3306028a8728622..71503c036f7c1496c2cd873a55a5e4bba676d6f2 100644 (file)
@@ -556,10 +556,9 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                                         * indicate this to the interpreter, set the
                                         * object to the root
                                         */
-                                       obj_desc =
-                                           ACPI_CAST_PTR(union
-                                                         acpi_operand_object,
-                                                         acpi_gbl_root_node);
+                                       obj_desc = ACPI_CAST_PTR(union
+                                                                acpi_operand_object,
+                                                                acpi_gbl_root_node);
                                        status = AE_OK;
                                } else {
                                        /*
index 16c8e38b51ef944de7a1c90c6ae96cf30d61cfee..5afcdd9c74492aedd4eda84deeb3a9f3882e36c7 100644 (file)
@@ -630,12 +630,9 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)
  *
  ******************************************************************************/
 
-struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
-                                                 union acpi_parse_object
-                                                 *origin,
-                                                 union acpi_operand_object
-                                                 *method_desc,
-                                                 struct acpi_thread_state
+struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object
+                                                 *origin, union acpi_operand_object
+                                                 *method_desc, struct acpi_thread_state
                                                  *thread)
 {
        struct acpi_walk_state *walk_state;
index 635ba449ebc2c97e98c2bc615f44e87bcaaf3092..e22f4a973c0fdc4d4cf5670e8ace14d83e75abe1 100644 (file)
@@ -341,9 +341,8 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
 
        /* A Non-NULL gpe_device means this is a GPE Block Device */
 
-       obj_desc =
-           acpi_ns_get_attached_object((struct acpi_namespace_node *)
-                                       gpe_device);
+       obj_desc = acpi_ns_get_attached_object((struct acpi_namespace_node *)
+                                              gpe_device);
        if (!obj_desc || !obj_desc->device.gpe_block) {
                return (NULL);
        }
index ad5bc76edf4660a43aa7ea624d9ef92905f020b9..902c287b3a4fd0295f2a9f38418a1ba1228904ab 100644 (file)
@@ -1033,8 +1033,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
 
                        if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
                             ACPI_GPE_DISPATCH_METHOD)
-                           && (gpe_event_info->
-                               flags & ACPI_GPE_TYPE_RUNTIME)) {
+                           && (gpe_event_info->flags & ACPI_GPE_TYPE_RUNTIME)) {
                                gpe_enabled_count++;
                        }
 
index cae786ca8600edf12d26042b02c66a236a5a52ff..21cb749d0c75567534ebee05c78551bb289f1972 100644 (file)
@@ -196,15 +196,12 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
                notify_info->notify.value = (u16) notify_value;
                notify_info->notify.handler_obj = handler_obj;
 
-               acpi_ex_exit_interpreter();
-
-               acpi_ev_notify_dispatch(notify_info);
-
-               status = acpi_ex_enter_interpreter();
+               status =
+                   acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_ev_notify_dispatch,
+                                   notify_info);
                if (ACPI_FAILURE(status)) {
-                       return_ACPI_STATUS(status);
+                       acpi_ut_delete_generic_state(notify_info);
                }
-
        }
 
        if (!handler_obj) {
@@ -323,8 +320,9 @@ static u32 acpi_ev_global_lock_handler(void *context)
                acpi_gbl_global_lock_acquired = TRUE;
                /* Send a unit to the semaphore */
 
-               if (ACPI_FAILURE(acpi_os_signal_semaphore(
-                       acpi_gbl_global_lock_semaphore, 1))) {
+               if (ACPI_FAILURE
+                   (acpi_os_signal_semaphore
+                    (acpi_gbl_global_lock_semaphore, 1))) {
                        ACPI_ERROR((AE_INFO,
                                    "Could not signal Global Lock semaphore"));
                }
@@ -450,7 +448,9 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
        }
 
        if (ACPI_FAILURE(status)) {
-               status = acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex, timeout);
+               status =
+                   acpi_ex_system_wait_mutex(acpi_gbl_global_lock_mutex,
+                                             timeout);
        }
        if (ACPI_FAILURE(status)) {
                return_ACPI_STATUS(status);
index 96b0e84317482ed67d8ecdd493d678986cf1d6c9..e99f0c435a4724006c9d204c69349733b91d763f 100644 (file)
@@ -291,7 +291,6 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                               u32 bit_width, acpi_integer * value)
 {
        acpi_status status;
-       acpi_status status2;
        acpi_adr_space_handler handler;
        acpi_adr_space_setup region_setup;
        union acpi_operand_object *handler_desc;
@@ -345,7 +344,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 * setup will potentially execute control methods
                 * (e.g., _REG method for this region)
                 */
-               acpi_ex_exit_interpreter();
+               acpi_ex_relinquish_interpreter();
 
                status = region_setup(region_obj, ACPI_REGION_ACTIVATE,
                                      handler_desc->address_space.context,
@@ -353,10 +352,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
 
                /* Re-enter the interpreter */
 
-               status2 = acpi_ex_enter_interpreter();
-               if (ACPI_FAILURE(status2)) {
-                       return_ACPI_STATUS(status2);
-               }
+               acpi_ex_reacquire_interpreter();
 
                /* Check for failure of the Region Setup */
 
@@ -409,7 +405,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 * exit the interpreter because the handler *might* block -- we don't
                 * know what it will do, so we can't hold the lock on the intepreter.
                 */
-               acpi_ex_exit_interpreter();
+               acpi_ex_relinquish_interpreter();
        }
 
        /* Call the handler */
@@ -430,10 +426,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                 * We just returned from a non-default handler, we must re-enter the
                 * interpreter
                 */
-               status2 = acpi_ex_enter_interpreter();
-               if (ACPI_FAILURE(status2)) {
-                       return_ACPI_STATUS(status2);
-               }
+               acpi_ex_reacquire_interpreter();
        }
 
        return_ACPI_STATUS(status);
index a4fa7e6822a30a7b40e3ff00abff1654af650174..400d90fca966ca9c08aa2c68233d56f47790bc00 100644 (file)
@@ -228,7 +228,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
 
                                /* Install a handler for this PCI root bridge */
 
-                               status = acpi_install_address_space_handler((acpi_handle) pci_root_node, ACPI_ADR_SPACE_PCI_CONFIG, ACPI_DEFAULT_HANDLER, NULL, NULL);
+                               status =
+                                   acpi_install_address_space_handler((acpi_handle) pci_root_node, ACPI_ADR_SPACE_PCI_CONFIG, ACPI_DEFAULT_HANDLER, NULL, NULL);
                                if (ACPI_FAILURE(status)) {
                                        if (status == AE_SAME_HANDLER) {
                                                /*
index a3379bafa676dc7da65fd71aeed1db5091ad7de7..6d866a01f5f439e06f79624de1bd268267b93f2a 100644 (file)
@@ -91,7 +91,6 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)
 
 ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
 #endif                         /*  ACPI_FUTURE_USAGE  */
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_install_fixed_event_handler
@@ -768,11 +767,9 @@ acpi_status acpi_acquire_global_lock(u16 timeout, u32 * handle)
                return (AE_BAD_PARAMETER);
        }
 
-       status = acpi_ex_enter_interpreter();
-       if (ACPI_FAILURE(status)) {
-               return (status);
-       }
+       /* Must lock interpreter to prevent race conditions */
 
+       acpi_ex_enter_interpreter();
        status = acpi_ev_acquire_global_lock(timeout);
        acpi_ex_exit_interpreter();
 
index 17065e98807c1921d1fcee9aa51d5423fd84ffd3..9cbd3414a574ebf4cad5c94f54a7f95883363189 100644 (file)
@@ -472,7 +472,6 @@ acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_clear_gpe)
-
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
  *
@@ -568,7 +567,6 @@ acpi_get_gpe_status(acpi_handle gpe_device,
 
 ACPI_EXPORT_SYMBOL(acpi_get_gpe_status)
 #endif                         /*  ACPI_FUTURE_USAGE  */
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_install_gpe_block
index d470e8b1f4ea6052a60643d45c800ce04aa2c7f6..79f2c0d42c06a59ff5a56b8c4062371aeb18362b 100644 (file)
@@ -512,9 +512,8 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
                 * Create a new string object and string buffer
                 * (-1 because of extra separator included in string_length from above)
                 */
-               return_desc =
-                   acpi_ut_create_string_object((acpi_size)
-                                                (string_length - 1));
+               return_desc = acpi_ut_create_string_object((acpi_size)
+                                                          (string_length - 1));
                if (!return_desc) {
                        return_ACPI_STATUS(AE_NO_MEMORY);
                }
index ae97812681a3ee7fa9ce448aadc0baaea51f7b39..6e9a23e47fef38e5c39497daa0c46a713d3ee726 100644 (file)
@@ -50,7 +50,6 @@
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("excreate")
-
 #ifndef ACPI_NO_METHOD_EXECUTION
 /*******************************************************************************
  *
@@ -583,10 +582,7 @@ acpi_ex_create_method(u8 * aml_start,
         * Get the sync_level. If method is serialized, a mutex will be
         * created for this method when it is parsed.
         */
-       if (acpi_gbl_all_methods_serialized) {
-               obj_desc->method.sync_level = 0;
-               obj_desc->method.method_flags |= AML_METHOD_SERIALIZED;
-       } else if (method_flags & AML_METHOD_SERIALIZED) {
+       if (method_flags & AML_METHOD_SERIALIZED) {
                /*
                 * ACPI 1.0: sync_level = 0
                 * ACPI 2.0: sync_level = sync_level in method declaration
index 1a73c14df2c5aa7d7f7cdd1c195bb1e202747139..51c9c29987c3d102a857ecf8d30f937771b27da4 100644 (file)
@@ -134,7 +134,7 @@ static struct acpi_exdump_info acpi_ex_dump_method[8] = {
 static struct acpi_exdump_info acpi_ex_dump_mutex[5] = {
        {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE(acpi_ex_dump_mutex), NULL},
        {ACPI_EXD_UINT8, ACPI_EXD_OFFSET(mutex.sync_level), "Sync Level"},
-       {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(mutex.owner_thread_id), "Owner Thread"},
+       {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(mutex.owner_thread), "Owner Thread"},
        {ACPI_EXD_UINT16, ACPI_EXD_OFFSET(mutex.acquisition_depth),
         "Acquire Depth"},
        {ACPI_EXD_POINTER, ACPI_EXD_OFFSET(mutex.os_mutex), "OsMutex"}
@@ -451,9 +451,8 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth)
 
        ACPI_FUNCTION_NAME(ex_dump_operand)
 
-           if (!
-               ((ACPI_LV_EXEC & acpi_dbg_level)
-                && (_COMPONENT & acpi_dbg_layer))) {
+           if (!((ACPI_LV_EXEC & acpi_dbg_level)
+                 && (_COMPONENT & acpi_dbg_layer))) {
                return;
        }
 
@@ -844,9 +843,8 @@ void acpi_ex_dump_namespace_node(struct acpi_namespace_node *node, u32 flags)
        ACPI_FUNCTION_ENTRY();
 
        if (!flags) {
-               if (!
-                   ((ACPI_LV_OBJECTS & acpi_dbg_level)
-                    && (_COMPONENT & acpi_dbg_layer))) {
+               if (!((ACPI_LV_OBJECTS & acpi_dbg_level)
+                     && (_COMPONENT & acpi_dbg_layer))) {
                        return;
                }
        }
@@ -1011,9 +1009,8 @@ acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)
        }
 
        if (!flags) {
-               if (!
-                   ((ACPI_LV_OBJECTS & acpi_dbg_level)
-                    && (_COMPONENT & acpi_dbg_layer))) {
+               if (!((ACPI_LV_OBJECTS & acpi_dbg_level)
+                     && (_COMPONENT & acpi_dbg_layer))) {
                        return_VOID;
                }
        }
index 4eb883bda6ae7f23800decda4a549042c64c8a94..6748e3ef09972472d9aeeaeaa1abf639773a77a8 100644 (file)
@@ -66,9 +66,10 @@ acpi_ex_link_mutex(union acpi_operand_object *obj_desc,
  *
  ******************************************************************************/
 
-void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc,
-                         struct acpi_thread_state *thread)
+void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc)
 {
+       struct acpi_thread_state *thread = obj_desc->mutex.owner_thread;
+
        if (!thread) {
                return;
        }
@@ -173,13 +174,16 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
 
        /* Support for multiple acquires by the owning thread */
 
-       if (obj_desc->mutex.owner_thread_id == acpi_os_get_thread_id()) {
-               /*
-                * The mutex is already owned by this thread, just increment the
-                * acquisition depth
-                */
-               obj_desc->mutex.acquisition_depth++;
-               return_ACPI_STATUS(AE_OK);
+       if (obj_desc->mutex.owner_thread) {
+               if (obj_desc->mutex.owner_thread->thread_id ==
+                   walk_state->thread->thread_id) {
+                       /*
+                        * The mutex is already owned by this thread, just increment the
+                        * acquisition depth
+                        */
+                       obj_desc->mutex.acquisition_depth++;
+                       return_ACPI_STATUS(AE_OK);
+               }
        }
 
        /* Acquire the mutex, wait if necessary. Special case for Global Lock */
@@ -202,7 +206,7 @@ acpi_ex_acquire_mutex(union acpi_operand_object *time_desc,
 
        /* Have the mutex: update mutex and walk info and save the sync_level */
 
-       obj_desc->mutex.owner_thread_id = acpi_os_get_thread_id();
+       obj_desc->mutex.owner_thread = walk_state->thread;
        obj_desc->mutex.acquisition_depth = 1;
        obj_desc->mutex.original_sync_level =
            walk_state->thread->current_sync_level;
@@ -242,7 +246,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
 
        /* The mutex must have been previously acquired in order to release it */
 
-       if (!obj_desc->mutex.owner_thread_id) {
+       if (!obj_desc->mutex.owner_thread) {
                ACPI_ERROR((AE_INFO,
                            "Cannot release Mutex [%4.4s], not acquired",
                            acpi_ut_get_node_name(obj_desc->mutex.node)));
@@ -262,14 +266,15 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
         * The Mutex is owned, but this thread must be the owner.
         * Special case for Global Lock, any thread can release
         */
-       if ((obj_desc->mutex.owner_thread_id !=
+       if ((obj_desc->mutex.owner_thread->thread_id !=
             walk_state->thread->thread_id)
            && (obj_desc->mutex.os_mutex != acpi_gbl_global_lock_mutex)) {
                ACPI_ERROR((AE_INFO,
                            "Thread %lX cannot release Mutex [%4.4s] acquired by thread %lX",
                            (unsigned long)walk_state->thread->thread_id,
                            acpi_ut_get_node_name(obj_desc->mutex.node),
-                           (unsigned long)obj_desc->mutex.owner_thread_id));
+                           (unsigned long)obj_desc->mutex.owner_thread->
+                           thread_id));
                return_ACPI_STATUS(AE_AML_NOT_OWNER);
        }
 
@@ -296,7 +301,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
 
        /* Unlink the mutex from the owner's list */
 
-       acpi_ex_unlink_mutex(obj_desc, walk_state->thread);
+       acpi_ex_unlink_mutex(obj_desc);
 
        /* Release the mutex, special case for Global Lock */
 
@@ -308,7 +313,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
 
        /* Update the mutex and restore sync_level */
 
-       obj_desc->mutex.owner_thread_id = ACPI_MUTEX_NOT_ACQUIRED;
+       obj_desc->mutex.owner_thread = NULL;
        walk_state->thread->current_sync_level =
            obj_desc->mutex.original_sync_level;
 
@@ -363,7 +368,7 @@ void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread)
 
                /* Mark mutex unowned */
 
-               obj_desc->mutex.owner_thread_id = ACPI_MUTEX_NOT_ACQUIRED;
+               obj_desc->mutex.owner_thread = NULL;
 
                /* Update Thread sync_level (Last mutex is the important one) */
 
index 1ee4fb1175c680f5b8b7d3f706e467c5b73683ba..308eae52dc054d72c670fb8bccc8a90f6dd7e93d 100644 (file)
@@ -177,8 +177,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
 
        ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "Bytes from stream:\n"));
 
-       for (index = 0;
-            (index < ACPI_NAME_SIZE)
+       for (index = 0; (index < ACPI_NAME_SIZE)
             && (acpi_ut_valid_acpi_char(*aml_address, 0)); index++) {
                char_buf[index] = *aml_address++;
                ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "%c\n", char_buf[index]));
index a6696621ff1b567d18652e4a31e8a86d574e99ef..efe5d4b461a47a7c91351608ce876ffc76de1566 100644 (file)
@@ -242,7 +242,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
                                            obj_desc->common_field.bit_length,
                                            0xFFFFFFFF
                                            /* Temp until we pass region_length as parameter */
-                                           );
+                   );
                bit_length = byte_alignment * 8;
 #endif
 
index ba761862a5990c85551c41a9bebaeeedd24b67eb..09d897b3f6d5b1848490eac18b9d09370409f782 100644 (file)
@@ -354,8 +354,7 @@ acpi_ex_resolve_operands(u16 opcode,
                        if ((opcode == AML_STORE_OP) &&
                            (ACPI_GET_OBJECT_TYPE(*stack_ptr) ==
                             ACPI_TYPE_LOCAL_REFERENCE)
-                           && ((*stack_ptr)->reference.opcode ==
-                               AML_INDEX_OP)) {
+                           && ((*stack_ptr)->reference.opcode == AML_INDEX_OP)) {
                                goto next_operand;
                        }
                        break;
index b2edf620ba8968d1086dfe1938be8727a8d1580e..9460baff30328f4c5565e2c5d671eabfdf4f634c 100644 (file)
@@ -66,7 +66,6 @@ ACPI_MODULE_NAME("exsystem")
 acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
 {
        acpi_status status;
-       acpi_status status2;
 
        ACPI_FUNCTION_TRACE(ex_system_wait_semaphore);
 
@@ -79,7 +78,7 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
 
                /* We must wait, so unlock the interpreter */
 
-               acpi_ex_exit_interpreter();
+               acpi_ex_relinquish_interpreter();
 
                status = acpi_os_wait_semaphore(semaphore, 1, timeout);
 
@@ -89,13 +88,7 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
 
                /* Reacquire the interpreter */
 
-               status2 = acpi_ex_enter_interpreter();
-               if (ACPI_FAILURE(status2)) {
-
-                       /* Report fatal error, could not acquire interpreter */
-
-                       return_ACPI_STATUS(status2);
-               }
+               acpi_ex_reacquire_interpreter();
        }
 
        return_ACPI_STATUS(status);
@@ -119,7 +112,6 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
 acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
 {
        acpi_status status;
-       acpi_status status2;
 
        ACPI_FUNCTION_TRACE(ex_system_wait_mutex);
 
@@ -132,7 +124,7 @@ acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
 
                /* We must wait, so unlock the interpreter */
 
-               acpi_ex_exit_interpreter();
+               acpi_ex_relinquish_interpreter();
 
                status = acpi_os_acquire_mutex(mutex, timeout);
 
@@ -142,13 +134,7 @@ acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
 
                /* Reacquire the interpreter */
 
-               status2 = acpi_ex_enter_interpreter();
-               if (ACPI_FAILURE(status2)) {
-
-                       /* Report fatal error, could not acquire interpreter */
-
-                       return_ACPI_STATUS(status2);
-               }
+               acpi_ex_reacquire_interpreter();
        }
 
        return_ACPI_STATUS(status);
@@ -209,20 +195,18 @@ acpi_status acpi_ex_system_do_stall(u32 how_long)
 
 acpi_status acpi_ex_system_do_suspend(acpi_integer how_long)
 {
-       acpi_status status;
-
        ACPI_FUNCTION_ENTRY();
 
        /* Since this thread will sleep, we must release the interpreter */
 
-       acpi_ex_exit_interpreter();
+       acpi_ex_relinquish_interpreter();
 
        acpi_os_sleep(how_long);
 
        /* And now we must get the interpreter again */
 
-       status = acpi_ex_enter_interpreter();
-       return (status);
+       acpi_ex_reacquire_interpreter();
+       return (AE_OK);
 }
 
 /*******************************************************************************
index aea461f3a48cc02ab7269c8e7e7e9807657edefc..6b0aeccbb69b3f59738d5a9dd22fe875a1a2d018 100644 (file)
@@ -76,14 +76,15 @@ static u32 acpi_ex_digits_needed(acpi_integer value, u32 base);
  *
  * PARAMETERS:  None
  *
- * RETURN:      Status
+ * RETURN:      None
  *
- * DESCRIPTION: Enter the interpreter execution region.  Failure to enter
- *              the interpreter region is a fatal system error
+ * DESCRIPTION: Enter the interpreter execution region. Failure to enter
+ *              the interpreter region is a fatal system error. Used in
+ *              conjunction with exit_interpreter.
  *
  ******************************************************************************/
 
-acpi_status acpi_ex_enter_interpreter(void)
+void acpi_ex_enter_interpreter(void)
 {
        acpi_status status;
 
@@ -91,31 +92,55 @@ acpi_status acpi_ex_enter_interpreter(void)
 
        status = acpi_ut_acquire_mutex(ACPI_MTX_INTERPRETER);
        if (ACPI_FAILURE(status)) {
-               ACPI_ERROR((AE_INFO, "Could not acquire interpreter mutex"));
+               ACPI_ERROR((AE_INFO,
+                           "Could not acquire AML Interpreter mutex"));
        }
 
-       return_ACPI_STATUS(status);
+       return_VOID;
 }
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ex_exit_interpreter
+ * FUNCTION:    acpi_ex_reacquire_interpreter
  *
  * PARAMETERS:  None
  *
  * RETURN:      None
  *
- * DESCRIPTION: Exit the interpreter execution region
+ * DESCRIPTION: Reacquire the interpreter execution region from within the
+ *              interpreter code. Failure to enter the interpreter region is a
+ *              fatal system error. Used in  conjuction with
+ *              relinquish_interpreter
+ *
+ ******************************************************************************/
+
+void acpi_ex_reacquire_interpreter(void)
+{
+       ACPI_FUNCTION_TRACE(ex_reacquire_interpreter);
+
+       /*
+        * If the global serialized flag is set, do not release the interpreter,
+        * since it was not actually released by acpi_ex_relinquish_interpreter.
+        * This forces the interpreter to be single threaded.
+        */
+       if (!acpi_gbl_all_methods_serialized) {
+               acpi_ex_enter_interpreter();
+       }
+
+       return_VOID;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ex_exit_interpreter
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
  *
- * Cases where the interpreter is unlocked:
- *      1) Completion of the execution of a control method
- *      2) Method blocked on a Sleep() AML opcode
- *      3) Method blocked on an Acquire() AML opcode
- *      4) Method blocked on a Wait() AML opcode
- *      5) Method blocked to acquire the global lock
- *      6) Method blocked to execute a serialized control method that is
- *          already executing
- *      7) About to invoke a user-installed opregion handler
+ * DESCRIPTION: Exit the interpreter execution region. This is the top level
+ *              routine used to exit the interpreter when all processing has
+ *              been completed.
  *
  ******************************************************************************/
 
@@ -127,7 +152,46 @@ void acpi_ex_exit_interpreter(void)
 
        status = acpi_ut_release_mutex(ACPI_MTX_INTERPRETER);
        if (ACPI_FAILURE(status)) {
-               ACPI_ERROR((AE_INFO, "Could not release interpreter mutex"));
+               ACPI_ERROR((AE_INFO,
+                           "Could not release AML Interpreter mutex"));
+       }
+
+       return_VOID;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ex_relinquish_interpreter
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Exit the interpreter execution region, from within the
+ *              interpreter - before attempting an operation that will possibly
+ *              block the running thread.
+ *
+ * Cases where the interpreter is unlocked internally
+ *      1) Method to be blocked on a Sleep() AML opcode
+ *      2) Method to be blocked on an Acquire() AML opcode
+ *      3) Method to be blocked on a Wait() AML opcode
+ *      4) Method to be blocked to acquire the global lock
+ *      5) Method to be blocked waiting to execute a serialized control method
+ *          that is currently executing
+ *      6) About to invoke a user-installed opregion handler
+ *
+ ******************************************************************************/
+
+void acpi_ex_relinquish_interpreter(void)
+{
+       ACPI_FUNCTION_TRACE(ex_relinquish_interpreter);
+
+       /*
+        * If the global serialized flag is set, do not release the interpreter.
+        * This forces the interpreter to be single threaded.
+        */
+       if (!acpi_gbl_all_methods_serialized) {
+               acpi_ex_exit_interpreter();
        }
 
        return_VOID;
@@ -141,8 +205,8 @@ void acpi_ex_exit_interpreter(void)
  *
  * RETURN:      none
  *
- * DESCRIPTION: Truncate a number to 32-bits if the currently executing method
- *              belongs to a 32-bit ACPI table.
+ * DESCRIPTION: Truncate an ACPI Integer to 32 bits if the execution mode is
+ *              32-bit, as determined by the revision of the DSDT.
  *
  ******************************************************************************/
 
index c84b1faba28cf3900001c78f2b0700975faf4d61..76c525dc590b3b91aedfe0c99d6526eabfe5bbc9 100644 (file)
@@ -152,7 +152,6 @@ acpi_get_firmware_waking_vector(acpi_physical_address * physical_address)
 
 ACPI_EXPORT_SYMBOL(acpi_get_firmware_waking_vector)
 #endif
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_enter_sleep_state_prep
index 26fd0dd6953dc7be4792610f8e662276b46d6124..97b2ac57c16be69d7ad94c1899410f806164e9af 100644 (file)
@@ -75,7 +75,7 @@ ACPI_MODULE_NAME("nseval")
  * MUTEX:       Locks interpreter
  *
  ******************************************************************************/
-acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
+acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
 {
        acpi_status status;
 
@@ -154,11 +154,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
                 * Execute the method via the interpreter. The interpreter is locked
                 * here before calling into the AML parser
                 */
-               status = acpi_ex_enter_interpreter();
-               if (ACPI_FAILURE(status)) {
-                       return_ACPI_STATUS(status);
-               }
-
+               acpi_ex_enter_interpreter();
                status = acpi_ps_execute_method(info);
                acpi_ex_exit_interpreter();
        } else {
@@ -182,10 +178,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
                 * resolution, we must lock it because we could access an opregion.
                 * The opregion access code assumes that the interpreter is locked.
                 */
-               status = acpi_ex_enter_interpreter();
-               if (ACPI_FAILURE(status)) {
-                       return_ACPI_STATUS(status);
-               }
+               acpi_ex_enter_interpreter();
 
                /* Function has a strange interface */
 
index c4ab615f77fea6a133f2f1cf9865217e9d02b0d5..33db2241044e5930430c5091f6580c9013721f15 100644 (file)
@@ -214,7 +214,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
                        u32 level, void *context, void **return_value)
 {
        acpi_object_type type;
-       acpi_status status;
+       acpi_status status = AE_OK;
        struct acpi_init_walk_info *info =
            (struct acpi_init_walk_info *)context;
        struct acpi_namespace_node *node =
@@ -268,10 +268,7 @@ acpi_ns_init_one_object(acpi_handle obj_handle,
        /*
         * Must lock the interpreter before executing AML code
         */
-       status = acpi_ex_enter_interpreter();
-       if (ACPI_FAILURE(status)) {
-               return (status);
-       }
+       acpi_ex_enter_interpreter();
 
        /*
         * Each of these types can contain executable AML code within the
index 94eb8f332d941bb67a0175e85f17d4560ecd4f4d..280b8357c46c32ebe3f5dc9933f6a19ae95f4d0e 100644 (file)
@@ -65,10 +65,8 @@ ACPI_MODULE_NAME("nswalk")
  *              within Scope is returned.
  *
  ******************************************************************************/
-struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,
-                                                 struct acpi_namespace_node
-                                                 *parent_node,
-                                                 struct acpi_namespace_node
+struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, struct acpi_namespace_node
+                                                 *parent_node, struct acpi_namespace_node
                                                  *child_node)
 {
        struct acpi_namespace_node *next_node = NULL;
index 8904d0fae6a2ff90794389456b6f62420c5410d3..be4f2899de74e6b6d91af7978f6f411452f1391b 100644 (file)
@@ -48,7 +48,6 @@
 
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsxfeval")
-
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
  *
@@ -73,8 +72,8 @@ ACPI_MODULE_NAME("nsxfeval")
 acpi_status
 acpi_evaluate_object_typed(acpi_handle handle,
                           acpi_string pathname,
-                          struct acpi_object_list * external_params,
-                          struct acpi_buffer * return_buffer,
+                          struct acpi_object_list *external_params,
+                          struct acpi_buffer *return_buffer,
                           acpi_object_type return_type)
 {
        acpi_status status;
@@ -143,7 +142,6 @@ acpi_evaluate_object_typed(acpi_handle handle,
 
 ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed)
 #endif                         /*  ACPI_FUTURE_USAGE  */
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_evaluate_object
@@ -170,7 +168,6 @@ acpi_evaluate_object(acpi_handle handle,
                     struct acpi_buffer *return_buffer)
 {
        acpi_status status;
-       acpi_status status2;
        struct acpi_evaluate_info *info;
        acpi_size buffer_space_needed;
        u32 i;
@@ -329,14 +326,12 @@ acpi_evaluate_object(acpi_handle handle,
                 * Delete the internal return object. NOTE: Interpreter must be
                 * locked to avoid race condition.
                 */
-               status2 = acpi_ex_enter_interpreter();
-               if (ACPI_SUCCESS(status2)) {
+               acpi_ex_enter_interpreter();
 
-                       /* Remove one reference on the return object (should delete it) */
+               /* Remove one reference on the return object (should delete it) */
 
-                       acpi_ut_remove_reference(info->return_object);
-                       acpi_ex_exit_interpreter();
-               }
+               acpi_ut_remove_reference(info->return_object);
+               acpi_ex_exit_interpreter();
        }
 
       cleanup:
index c2bed56915e1eafe1559d906ba06661764990d45..b998340e23d4126074a36cc1af38d05461b4bde9 100644 (file)
@@ -71,6 +71,7 @@ static unsigned int acpi_irq_irq;
 static acpi_osd_handler acpi_irq_handler;
 static void *acpi_irq_context;
 static struct workqueue_struct *kacpid_wq;
+static struct workqueue_struct *kacpi_notify_wq;
 
 static void __init acpi_request_region (struct acpi_generic_address *addr,
        unsigned int length, char *desc)
@@ -137,8 +138,9 @@ acpi_status acpi_os_initialize1(void)
                return AE_NULL_ENTRY;
        }
        kacpid_wq = create_singlethread_workqueue("kacpid");
+       kacpi_notify_wq = create_singlethread_workqueue("kacpi_notify");
        BUG_ON(!kacpid_wq);
-
+       BUG_ON(!kacpi_notify_wq);
        return AE_OK;
 }
 
@@ -150,6 +152,7 @@ acpi_status acpi_os_terminate(void)
        }
 
        destroy_workqueue(kacpid_wq);
+       destroy_workqueue(kacpi_notify_wq);
 
        return AE_OK;
 }
@@ -601,6 +604,23 @@ void acpi_os_derive_pci_id(acpi_handle rhandle,    /* upper bound  */
 }
 
 static void acpi_os_execute_deferred(struct work_struct *work)
+{
+       struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
+       if (!dpc) {
+               printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
+               return;
+       }
+
+       dpc->function(dpc->context);
+       kfree(dpc);
+
+       /* Yield cpu to notify thread */
+       cond_resched();
+
+       return;
+}
+
+static void acpi_os_execute_notify(struct work_struct *work)
 {
        struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work);
 
@@ -637,14 +657,12 @@ acpi_status acpi_os_execute(acpi_execute_type type,
        acpi_status status = AE_OK;
        struct acpi_os_dpc *dpc;
 
-       ACPI_FUNCTION_TRACE("os_queue_for_execution");
-
        ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                          "Scheduling function [%p(%p)] for deferred execution.\n",
                          function, context));
 
        if (!function)
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               return AE_BAD_PARAMETER;
 
        /*
         * Allocate/initialize DPC structure.  Note that this memory will be
@@ -662,14 +680,21 @@ acpi_status acpi_os_execute(acpi_execute_type type,
        dpc->function = function;
        dpc->context = context;
 
-       INIT_WORK(&dpc->work, acpi_os_execute_deferred);
-       if (!queue_work(kacpid_wq, &dpc->work)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+       if (type == OSL_NOTIFY_HANDLER) {
+               INIT_WORK(&dpc->work, acpi_os_execute_notify);
+               if (!queue_work(kacpi_notify_wq, &dpc->work)) {
+                       status = AE_ERROR;
+                       kfree(dpc);
+               }
+       } else {
+               INIT_WORK(&dpc->work, acpi_os_execute_deferred);
+               if (!queue_work(kacpid_wq, &dpc->work)) {
+                       ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                  "Call to queue_work() failed.\n"));
-               kfree(dpc);
-               status = AE_ERROR;
+                       status = AE_ERROR;
+                       kfree(dpc);
+               }
        }
-
        return_ACPI_STATUS(status);
 }
 
index 16d8b6cc3c220407917111204ba587f6164845aa..9296e86761d74f2aa4000167f068f611d36486d3 100644 (file)
@@ -185,459 +185,453 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
 /* Index           Name                 Parser Args               Interpreter Args                ObjectType                    Class                      Type                  Flags */
 
 /* 00 */ ACPI_OP("Zero", ARGP_ZERO_OP, ARGI_ZERO_OP, ACPI_TYPE_INTEGER,
-                        AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
+                AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
 /* 01 */ ACPI_OP("One", ARGP_ONE_OP, ARGI_ONE_OP, ACPI_TYPE_INTEGER,
-                        AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
+                AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
 /* 02 */ ACPI_OP("Alias", ARGP_ALIAS_OP, ARGI_ALIAS_OP,
-                        ACPI_TYPE_LOCAL_ALIAS, AML_CLASS_NAMED_OBJECT,
-                        AML_TYPE_NAMED_SIMPLE,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_NSNODE | AML_NAMED),
+                ACPI_TYPE_LOCAL_ALIAS, AML_CLASS_NAMED_OBJECT,
+                AML_TYPE_NAMED_SIMPLE,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                AML_NSNODE | AML_NAMED),
 /* 03 */ ACPI_OP("Name", ARGP_NAME_OP, ARGI_NAME_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_COMPLEX,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_NSNODE | AML_NAMED),
+                AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_COMPLEX,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                AML_NSNODE | AML_NAMED),
 /* 04 */ ACPI_OP("ByteConst", ARGP_BYTE_OP, ARGI_BYTE_OP,
-                        ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LITERAL, AML_CONSTANT),
+                ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                AML_TYPE_LITERAL, AML_CONSTANT),
 /* 05 */ ACPI_OP("WordConst", ARGP_WORD_OP, ARGI_WORD_OP,
-                        ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LITERAL, AML_CONSTANT),
+                ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                AML_TYPE_LITERAL, AML_CONSTANT),
 /* 06 */ ACPI_OP("DwordConst", ARGP_DWORD_OP, ARGI_DWORD_OP,
-                        ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LITERAL, AML_CONSTANT),
+                ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                AML_TYPE_LITERAL, AML_CONSTANT),
 /* 07 */ ACPI_OP("String", ARGP_STRING_OP, ARGI_STRING_OP,
-                        ACPI_TYPE_STRING, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LITERAL, AML_CONSTANT),
+                ACPI_TYPE_STRING, AML_CLASS_ARGUMENT,
+                AML_TYPE_LITERAL, AML_CONSTANT),
 /* 08 */ ACPI_OP("Scope", ARGP_SCOPE_OP, ARGI_SCOPE_OP,
-                        ACPI_TYPE_LOCAL_SCOPE, AML_CLASS_NAMED_OBJECT,
-                        AML_TYPE_NAMED_NO_OBJ,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_NSNODE | AML_NAMED),
+                ACPI_TYPE_LOCAL_SCOPE, AML_CLASS_NAMED_OBJECT,
+                AML_TYPE_NAMED_NO_OBJ,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                AML_NSNODE | AML_NAMED),
 /* 09 */ ACPI_OP("Buffer", ARGP_BUFFER_OP, ARGI_BUFFER_OP,
-                        ACPI_TYPE_BUFFER, AML_CLASS_CREATE,
-                        AML_TYPE_CREATE_OBJECT,
-                        AML_HAS_ARGS | AML_DEFER | AML_CONSTANT),
+                ACPI_TYPE_BUFFER, AML_CLASS_CREATE,
+                AML_TYPE_CREATE_OBJECT,
+                AML_HAS_ARGS | AML_DEFER | AML_CONSTANT),
 /* 0A */ ACPI_OP("Package", ARGP_PACKAGE_OP, ARGI_PACKAGE_OP,
-                        ACPI_TYPE_PACKAGE, AML_CLASS_CREATE,
-                        AML_TYPE_CREATE_OBJECT,
-                        AML_HAS_ARGS | AML_DEFER | AML_CONSTANT),
+                ACPI_TYPE_PACKAGE, AML_CLASS_CREATE,
+                AML_TYPE_CREATE_OBJECT,
+                AML_HAS_ARGS | AML_DEFER | AML_CONSTANT),
 /* 0B */ ACPI_OP("Method", ARGP_METHOD_OP, ARGI_METHOD_OP,
-                        ACPI_TYPE_METHOD, AML_CLASS_NAMED_OBJECT,
-                        AML_TYPE_NAMED_COMPLEX,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_NSNODE | AML_NAMED | AML_DEFER),
+                ACPI_TYPE_METHOD, AML_CLASS_NAMED_OBJECT,
+                AML_TYPE_NAMED_COMPLEX,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                AML_NSNODE | AML_NAMED | AML_DEFER),
 /* 0C */ ACPI_OP("Local0", ARGP_LOCAL0, ARGI_LOCAL0,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LOCAL_VARIABLE, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_LOCAL_VARIABLE, 0),
 /* 0D */ ACPI_OP("Local1", ARGP_LOCAL1, ARGI_LOCAL1,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LOCAL_VARIABLE, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_LOCAL_VARIABLE, 0),
 /* 0E */ ACPI_OP("Local2", ARGP_LOCAL2, ARGI_LOCAL2,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LOCAL_VARIABLE, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_LOCAL_VARIABLE, 0),
 /* 0F */ ACPI_OP("Local3", ARGP_LOCAL3, ARGI_LOCAL3,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LOCAL_VARIABLE, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_LOCAL_VARIABLE, 0),
 /* 10 */ ACPI_OP("Local4", ARGP_LOCAL4, ARGI_LOCAL4,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LOCAL_VARIABLE, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_LOCAL_VARIABLE, 0),
 /* 11 */ ACPI_OP("Local5", ARGP_LOCAL5, ARGI_LOCAL5,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LOCAL_VARIABLE, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_LOCAL_VARIABLE, 0),
 /* 12 */ ACPI_OP("Local6", ARGP_LOCAL6, ARGI_LOCAL6,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LOCAL_VARIABLE, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_LOCAL_VARIABLE, 0),
 /* 13 */ ACPI_OP("Local7", ARGP_LOCAL7, ARGI_LOCAL7,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LOCAL_VARIABLE, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_LOCAL_VARIABLE, 0),
 /* 14 */ ACPI_OP("Arg0", ARGP_ARG0, ARGI_ARG0,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_METHOD_ARGUMENT, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_METHOD_ARGUMENT, 0),
 /* 15 */ ACPI_OP("Arg1", ARGP_ARG1, ARGI_ARG1,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_METHOD_ARGUMENT, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_METHOD_ARGUMENT, 0),
 /* 16 */ ACPI_OP("Arg2", ARGP_ARG2, ARGI_ARG2,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_METHOD_ARGUMENT, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_METHOD_ARGUMENT, 0),
 /* 17 */ ACPI_OP("Arg3", ARGP_ARG3, ARGI_ARG3,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_METHOD_ARGUMENT, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_METHOD_ARGUMENT, 0),
 /* 18 */ ACPI_OP("Arg4", ARGP_ARG4, ARGI_ARG4,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_METHOD_ARGUMENT, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_METHOD_ARGUMENT, 0),
 /* 19 */ ACPI_OP("Arg5", ARGP_ARG5, ARGI_ARG5,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_METHOD_ARGUMENT, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_METHOD_ARGUMENT, 0),
 /* 1A */ ACPI_OP("Arg6", ARGP_ARG6, ARGI_ARG6,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_METHOD_ARGUMENT, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_METHOD_ARGUMENT, 0),
 /* 1B */ ACPI_OP("Store", ARGP_STORE_OP, ARGI_STORE_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                        AML_FLAGS_EXEC_1A_1T_1R),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                AML_FLAGS_EXEC_1A_1T_1R),
 /* 1C */ ACPI_OP("RefOf", ARGP_REF_OF_OP, ARGI_REF_OF_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R,
-                        AML_FLAGS_EXEC_1A_0T_1R),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R,
+                AML_FLAGS_EXEC_1A_0T_1R),
 /* 1D */ ACPI_OP("Add", ARGP_ADD_OP, ARGI_ADD_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 1E */ ACPI_OP("Concatenate", ARGP_CONCAT_OP, ARGI_CONCAT_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
 /* 1F */ ACPI_OP("Subtract", ARGP_SUBTRACT_OP, ARGI_SUBTRACT_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 20 */ ACPI_OP("Increment", ARGP_INCREMENT_OP, ARGI_INCREMENT_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_0T_1R,
-                        AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_0T_1R,
+                AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
 /* 21 */ ACPI_OP("Decrement", ARGP_DECREMENT_OP, ARGI_DECREMENT_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_0T_1R,
-                        AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_0T_1R,
+                AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
 /* 22 */ ACPI_OP("Multiply", ARGP_MULTIPLY_OP, ARGI_MULTIPLY_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 23 */ ACPI_OP("Divide", ARGP_DIVIDE_OP, ARGI_DIVIDE_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_2A_2T_1R,
-                        AML_FLAGS_EXEC_2A_2T_1R | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_2A_2T_1R,
+                AML_FLAGS_EXEC_2A_2T_1R | AML_CONSTANT),
 /* 24 */ ACPI_OP("ShiftLeft", ARGP_SHIFT_LEFT_OP, ARGI_SHIFT_LEFT_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 25 */ ACPI_OP("ShiftRight", ARGP_SHIFT_RIGHT_OP, ARGI_SHIFT_RIGHT_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 26 */ ACPI_OP("And", ARGP_BIT_AND_OP, ARGI_BIT_AND_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 27 */ ACPI_OP("NAnd", ARGP_BIT_NAND_OP, ARGI_BIT_NAND_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 28 */ ACPI_OP("Or", ARGP_BIT_OR_OP, ARGI_BIT_OR_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 29 */ ACPI_OP("NOr", ARGP_BIT_NOR_OP, ARGI_BIT_NOR_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 2A */ ACPI_OP("XOr", ARGP_BIT_XOR_OP, ARGI_BIT_XOR_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_MATH | AML_CONSTANT),
 /* 2B */ ACPI_OP("Not", ARGP_BIT_NOT_OP, ARGI_BIT_NOT_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                        AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 2C */ ACPI_OP("FindSetLeftBit", ARGP_FIND_SET_LEFT_BIT_OP,
-                        ARGI_FIND_SET_LEFT_BIT_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                        AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                ARGI_FIND_SET_LEFT_BIT_OP, ACPI_TYPE_ANY,
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 2D */ ACPI_OP("FindSetRightBit", ARGP_FIND_SET_RIGHT_BIT_OP,
-                        ARGI_FIND_SET_RIGHT_BIT_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                        AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                ARGI_FIND_SET_RIGHT_BIT_OP, ACPI_TYPE_ANY,
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 2E */ ACPI_OP("DerefOf", ARGP_DEREF_OF_OP, ARGI_DEREF_OF_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_0T_1R, AML_FLAGS_EXEC_1A_0T_1R),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_0T_1R, AML_FLAGS_EXEC_1A_0T_1R),
 /* 2F */ ACPI_OP("Notify", ARGP_NOTIFY_OP, ARGI_NOTIFY_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_2A_0T_0R, AML_FLAGS_EXEC_2A_0T_0R),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_2A_0T_0R, AML_FLAGS_EXEC_2A_0T_0R),
 /* 30 */ ACPI_OP("SizeOf", ARGP_SIZE_OF_OP, ARGI_SIZE_OF_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_0T_1R,
-                        AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_0T_1R,
+                AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE),
 /* 31 */ ACPI_OP("Index", ARGP_INDEX_OP, ARGI_INDEX_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R),
 /* 32 */ ACPI_OP("Match", ARGP_MATCH_OP, ARGI_MATCH_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_6A_0T_1R,
-                        AML_FLAGS_EXEC_6A_0T_1R | AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_6A_0T_1R,
+                AML_FLAGS_EXEC_6A_0T_1R | AML_CONSTANT),
 /* 33 */ ACPI_OP("CreateDWordField", ARGP_CREATE_DWORD_FIELD_OP,
-                        ARGI_CREATE_DWORD_FIELD_OP,
-                        ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                        AML_TYPE_CREATE_FIELD,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                        AML_DEFER | AML_CREATE),
+                ARGI_CREATE_DWORD_FIELD_OP,
+                ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                AML_TYPE_CREATE_FIELD,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                AML_DEFER | AML_CREATE),
 /* 34 */ ACPI_OP("CreateWordField", ARGP_CREATE_WORD_FIELD_OP,
-                        ARGI_CREATE_WORD_FIELD_OP,
-                        ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                        AML_TYPE_CREATE_FIELD,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                        AML_DEFER | AML_CREATE),
+                ARGI_CREATE_WORD_FIELD_OP,
+                ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                AML_TYPE_CREATE_FIELD,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                AML_DEFER | AML_CREATE),
 /* 35 */ ACPI_OP("CreateByteField", ARGP_CREATE_BYTE_FIELD_OP,
-                        ARGI_CREATE_BYTE_FIELD_OP,
-                        ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                        AML_TYPE_CREATE_FIELD,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                        AML_DEFER | AML_CREATE),
+                ARGI_CREATE_BYTE_FIELD_OP,
+                ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                AML_TYPE_CREATE_FIELD,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                AML_DEFER | AML_CREATE),
 /* 36 */ ACPI_OP("CreateBitField", ARGP_CREATE_BIT_FIELD_OP,
-                        ARGI_CREATE_BIT_FIELD_OP,
-                        ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                        AML_TYPE_CREATE_FIELD,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                        AML_DEFER | AML_CREATE),
+                ARGI_CREATE_BIT_FIELD_OP,
+                ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                AML_TYPE_CREATE_FIELD,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                AML_DEFER | AML_CREATE),
 /* 37 */ ACPI_OP("ObjectType", ARGP_TYPE_OP, ARGI_TYPE_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_0T_1R,
-                        AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_0T_1R,
+                AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE),
 /* 38 */ ACPI_OP("LAnd", ARGP_LAND_OP, ARGI_LAND_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
-                        AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC |
-                        AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
+                AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC | AML_CONSTANT),
 /* 39 */ ACPI_OP("LOr", ARGP_LOR_OP, ARGI_LOR_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
-                        AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC |
-                        AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
+                AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL_NUMERIC | AML_CONSTANT),
 /* 3A */ ACPI_OP("LNot", ARGP_LNOT_OP, ARGI_LNOT_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R,
-                        AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_1R,
+                AML_FLAGS_EXEC_1A_0T_1R | AML_CONSTANT),
 /* 3B */ ACPI_OP("LEqual", ARGP_LEQUAL_OP, ARGI_LEQUAL_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_2A_0T_1R,
-                        AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_2A_0T_1R,
+                AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
 /* 3C */ ACPI_OP("LGreater", ARGP_LGREATER_OP, ARGI_LGREATER_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_2A_0T_1R,
-                        AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_2A_0T_1R,
+                AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
 /* 3D */ ACPI_OP("LLess", ARGP_LLESS_OP, ARGI_LLESS_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
-                        AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
+                AML_FLAGS_EXEC_2A_0T_1R | AML_LOGICAL | AML_CONSTANT),
 /* 3E */ ACPI_OP("If", ARGP_IF_OP, ARGI_IF_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
+                AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
 /* 3F */ ACPI_OP("Else", ARGP_ELSE_OP, ARGI_ELSE_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
+                AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
 /* 40 */ ACPI_OP("While", ARGP_WHILE_OP, ARGI_WHILE_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
+                AML_CLASS_CONTROL, AML_TYPE_CONTROL, AML_HAS_ARGS),
 /* 41 */ ACPI_OP("Noop", ARGP_NOOP_OP, ARGI_NOOP_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
+                AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
 /* 42 */ ACPI_OP("Return", ARGP_RETURN_OP, ARGI_RETURN_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_CONTROL,
-                        AML_TYPE_CONTROL, AML_HAS_ARGS),
+                ACPI_TYPE_ANY, AML_CLASS_CONTROL,
+                AML_TYPE_CONTROL, AML_HAS_ARGS),
 /* 43 */ ACPI_OP("Break", ARGP_BREAK_OP, ARGI_BREAK_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
+                AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
 /* 44 */ ACPI_OP("BreakPoint", ARGP_BREAK_POINT_OP, ARGI_BREAK_POINT_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
+                ACPI_TYPE_ANY, AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
 /* 45 */ ACPI_OP("Ones", ARGP_ONES_OP, ARGI_ONES_OP, ACPI_TYPE_INTEGER,
-                        AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
+                AML_CLASS_ARGUMENT, AML_TYPE_CONSTANT, AML_CONSTANT),
 
 /* Prefixed opcodes (Two-byte opcodes with a prefix op) */
 
 /* 46 */ ACPI_OP("Mutex", ARGP_MUTEX_OP, ARGI_MUTEX_OP, ACPI_TYPE_MUTEX,
-                        AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_NSNODE | AML_NAMED),
+                AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                AML_NSNODE | AML_NAMED),
 /* 47 */ ACPI_OP("Event", ARGP_EVENT_OP, ARGI_EVENT_OP, ACPI_TYPE_EVENT,
-                        AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
-                        AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED),
+                AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
+                AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED),
 /* 48 */ ACPI_OP("CondRefOf", ARGP_COND_REF_OF_OP, ARGI_COND_REF_OF_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R),
 /* 49 */ ACPI_OP("CreateField", ARGP_CREATE_FIELD_OP,
-                        ARGI_CREATE_FIELD_OP, ACPI_TYPE_BUFFER_FIELD,
-                        AML_CLASS_CREATE, AML_TYPE_CREATE_FIELD,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                        AML_DEFER | AML_FIELD | AML_CREATE),
+                ARGI_CREATE_FIELD_OP, ACPI_TYPE_BUFFER_FIELD,
+                AML_CLASS_CREATE, AML_TYPE_CREATE_FIELD,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                AML_DEFER | AML_FIELD | AML_CREATE),
 /* 4A */ ACPI_OP("Load", ARGP_LOAD_OP, ARGI_LOAD_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_0R,
-                        AML_FLAGS_EXEC_1A_1T_0R),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_0R,
+                AML_FLAGS_EXEC_1A_1T_0R),
 /* 4B */ ACPI_OP("Stall", ARGP_STALL_OP, ARGI_STALL_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
-                        AML_FLAGS_EXEC_1A_0T_0R),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
+                AML_FLAGS_EXEC_1A_0T_0R),
 /* 4C */ ACPI_OP("Sleep", ARGP_SLEEP_OP, ARGI_SLEEP_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
-                        AML_FLAGS_EXEC_1A_0T_0R),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
+                AML_FLAGS_EXEC_1A_0T_0R),
 /* 4D */ ACPI_OP("Acquire", ARGP_ACQUIRE_OP, ARGI_ACQUIRE_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_2A_0T_1R, AML_FLAGS_EXEC_2A_0T_1R),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_2A_0T_1R, AML_FLAGS_EXEC_2A_0T_1R),
 /* 4E */ ACPI_OP("Signal", ARGP_SIGNAL_OP, ARGI_SIGNAL_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
 /* 4F */ ACPI_OP("Wait", ARGP_WAIT_OP, ARGI_WAIT_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
-                        AML_FLAGS_EXEC_2A_0T_1R),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R,
+                AML_FLAGS_EXEC_2A_0T_1R),
 /* 50 */ ACPI_OP("Reset", ARGP_RESET_OP, ARGI_RESET_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
-                        AML_FLAGS_EXEC_1A_0T_0R),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R,
+                AML_FLAGS_EXEC_1A_0T_0R),
 /* 51 */ ACPI_OP("Release", ARGP_RELEASE_OP, ARGI_RELEASE_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
 /* 52 */ ACPI_OP("FromBCD", ARGP_FROM_BCD_OP, ARGI_FROM_BCD_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_1T_1R,
-                        AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_1T_1R,
+                AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 53 */ ACPI_OP("ToBCD", ARGP_TO_BCD_OP, ARGI_TO_BCD_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                        AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 54 */ ACPI_OP("Unload", ARGP_UNLOAD_OP, ARGI_UNLOAD_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R),
 /* 55 */ ACPI_OP("Revision", ARGP_REVISION_OP, ARGI_REVISION_OP,
-                        ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                        AML_TYPE_CONSTANT, 0),
+                ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                AML_TYPE_CONSTANT, 0),
 /* 56 */ ACPI_OP("Debug", ARGP_DEBUG_OP, ARGI_DEBUG_OP,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_CONSTANT, 0),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_CONSTANT, 0),
 /* 57 */ ACPI_OP("Fatal", ARGP_FATAL_OP, ARGI_FATAL_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_3A_0T_0R,
-                        AML_FLAGS_EXEC_3A_0T_0R),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_3A_0T_0R,
+                AML_FLAGS_EXEC_3A_0T_0R),
 /* 58 */ ACPI_OP("OperationRegion", ARGP_REGION_OP, ARGI_REGION_OP,
-                        ACPI_TYPE_REGION, AML_CLASS_NAMED_OBJECT,
-                        AML_TYPE_NAMED_COMPLEX,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_NSNODE | AML_NAMED | AML_DEFER),
+                ACPI_TYPE_REGION, AML_CLASS_NAMED_OBJECT,
+                AML_TYPE_NAMED_COMPLEX,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                AML_NSNODE | AML_NAMED | AML_DEFER),
 /* 59 */ ACPI_OP("Field", ARGP_FIELD_OP, ARGI_FIELD_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_FIELD,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_FIELD),
+                AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_FIELD,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD),
 /* 5A */ ACPI_OP("Device", ARGP_DEVICE_OP, ARGI_DEVICE_OP,
-                        ACPI_TYPE_DEVICE, AML_CLASS_NAMED_OBJECT,
-                        AML_TYPE_NAMED_NO_OBJ,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_NSNODE | AML_NAMED),
+                ACPI_TYPE_DEVICE, AML_CLASS_NAMED_OBJECT,
+                AML_TYPE_NAMED_NO_OBJ,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                AML_NSNODE | AML_NAMED),
 /* 5B */ ACPI_OP("Processor", ARGP_PROCESSOR_OP, ARGI_PROCESSOR_OP,
-                        ACPI_TYPE_PROCESSOR, AML_CLASS_NAMED_OBJECT,
-                        AML_TYPE_NAMED_SIMPLE,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_NSNODE | AML_NAMED),
+                ACPI_TYPE_PROCESSOR, AML_CLASS_NAMED_OBJECT,
+                AML_TYPE_NAMED_SIMPLE,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                AML_NSNODE | AML_NAMED),
 /* 5C */ ACPI_OP("PowerResource", ARGP_POWER_RES_OP, ARGI_POWER_RES_OP,
-                        ACPI_TYPE_POWER, AML_CLASS_NAMED_OBJECT,
-                        AML_TYPE_NAMED_SIMPLE,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_NSNODE | AML_NAMED),
+                ACPI_TYPE_POWER, AML_CLASS_NAMED_OBJECT,
+                AML_TYPE_NAMED_SIMPLE,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                AML_NSNODE | AML_NAMED),
 /* 5D */ ACPI_OP("ThermalZone", ARGP_THERMAL_ZONE_OP,
-                        ARGI_THERMAL_ZONE_OP, ACPI_TYPE_THERMAL,
-                        AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_NO_OBJ,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_NSNODE | AML_NAMED),
+                ARGI_THERMAL_ZONE_OP, ACPI_TYPE_THERMAL,
+                AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_NO_OBJ,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                AML_NSNODE | AML_NAMED),
 /* 5E */ ACPI_OP("IndexField", ARGP_INDEX_FIELD_OP, ARGI_INDEX_FIELD_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
-                        AML_TYPE_NAMED_FIELD,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_FIELD),
+                ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
+                AML_TYPE_NAMED_FIELD,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD),
 /* 5F */ ACPI_OP("BankField", ARGP_BANK_FIELD_OP, ARGI_BANK_FIELD_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
-                        AML_TYPE_NAMED_FIELD,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_FIELD),
+                ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
+                AML_TYPE_NAMED_FIELD,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD),
 
 /* Internal opcodes that map to invalid AML opcodes */
 
 /* 60 */ ACPI_OP("LNotEqual", ARGP_LNOTEQUAL_OP, ARGI_LNOTEQUAL_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
-                        AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
+                AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT),
 /* 61 */ ACPI_OP("LLessEqual", ARGP_LLESSEQUAL_OP, ARGI_LLESSEQUAL_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
-                        AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
+                AML_TYPE_BOGUS, AML_HAS_ARGS | AML_CONSTANT),
 /* 62 */ ACPI_OP("LGreaterEqual", ARGP_LGREATEREQUAL_OP,
-                        ARGI_LGREATEREQUAL_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_INTERNAL, AML_TYPE_BOGUS,
-                        AML_HAS_ARGS | AML_CONSTANT),
+                ARGI_LGREATEREQUAL_OP, ACPI_TYPE_ANY,
+                AML_CLASS_INTERNAL, AML_TYPE_BOGUS,
+                AML_HAS_ARGS | AML_CONSTANT),
 /* 63 */ ACPI_OP("-NamePath-", ARGP_NAMEPATH_OP, ARGI_NAMEPATH_OP,
-                        ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LITERAL, AML_NSOBJECT | AML_NSNODE),
+                ACPI_TYPE_LOCAL_REFERENCE, AML_CLASS_ARGUMENT,
+                AML_TYPE_LITERAL, AML_NSOBJECT | AML_NSNODE),
 /* 64 */ ACPI_OP("-MethodCall-", ARGP_METHODCALL_OP, ARGI_METHODCALL_OP,
-                        ACPI_TYPE_METHOD, AML_CLASS_METHOD_CALL,
-                        AML_TYPE_METHOD_CALL,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE),
+                ACPI_TYPE_METHOD, AML_CLASS_METHOD_CALL,
+                AML_TYPE_METHOD_CALL,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE),
 /* 65 */ ACPI_OP("-ByteList-", ARGP_BYTELIST_OP, ARGI_BYTELIST_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LITERAL, 0),
+                ACPI_TYPE_ANY, AML_CLASS_ARGUMENT,
+                AML_TYPE_LITERAL, 0),
 /* 66 */ ACPI_OP("-ReservedField-", ARGP_RESERVEDFIELD_OP,
-                        ARGI_RESERVEDFIELD_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
+                ARGI_RESERVEDFIELD_OP, ACPI_TYPE_ANY,
+                AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
 /* 67 */ ACPI_OP("-NamedField-", ARGP_NAMEDFIELD_OP, ARGI_NAMEDFIELD_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
-                        AML_TYPE_BOGUS,
-                        AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED),
+                ACPI_TYPE_ANY, AML_CLASS_INTERNAL,
+                AML_TYPE_BOGUS,
+                AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED),
 /* 68 */ ACPI_OP("-AccessField-", ARGP_ACCESSFIELD_OP,
-                        ARGI_ACCESSFIELD_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
+                ARGI_ACCESSFIELD_OP, ACPI_TYPE_ANY,
+                AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
 /* 69 */ ACPI_OP("-StaticString", ARGP_STATICSTRING_OP,
-                        ARGI_STATICSTRING_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
+                ARGI_STATICSTRING_OP, ACPI_TYPE_ANY,
+                AML_CLASS_INTERNAL, AML_TYPE_BOGUS, 0),
 /* 6A */ ACPI_OP("-Return Value-", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY,
-                        AML_CLASS_RETURN_VALUE, AML_TYPE_RETURN,
-                        AML_HAS_ARGS | AML_HAS_RETVAL),
+                AML_CLASS_RETURN_VALUE, AML_TYPE_RETURN,
+                AML_HAS_ARGS | AML_HAS_RETVAL),
 /* 6B */ ACPI_OP("-UNKNOWN_OP-", ARG_NONE, ARG_NONE, ACPI_TYPE_INVALID,
-                        AML_CLASS_UNKNOWN, AML_TYPE_BOGUS, AML_HAS_ARGS),
+                AML_CLASS_UNKNOWN, AML_TYPE_BOGUS, AML_HAS_ARGS),
 /* 6C */ ACPI_OP("-ASCII_ONLY-", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY,
-                        AML_CLASS_ASCII, AML_TYPE_BOGUS, AML_HAS_ARGS),
+                AML_CLASS_ASCII, AML_TYPE_BOGUS, AML_HAS_ARGS),
 /* 6D */ ACPI_OP("-PREFIX_ONLY-", ARG_NONE, ARG_NONE, ACPI_TYPE_ANY,
-                        AML_CLASS_PREFIX, AML_TYPE_BOGUS, AML_HAS_ARGS),
+                AML_CLASS_PREFIX, AML_TYPE_BOGUS, AML_HAS_ARGS),
 
 /* ACPI 2.0 opcodes */
 
 /* 6E */ ACPI_OP("QwordConst", ARGP_QWORD_OP, ARGI_QWORD_OP,
-                        ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
-                        AML_TYPE_LITERAL, AML_CONSTANT),
+                ACPI_TYPE_INTEGER, AML_CLASS_ARGUMENT,
+                AML_TYPE_LITERAL, AML_CONSTANT),
        /* 6F */ ACPI_OP("Package", /* Var */ ARGP_VAR_PACKAGE_OP,
                         ARGI_VAR_PACKAGE_OP, ACPI_TYPE_PACKAGE,
                         AML_CLASS_CREATE, AML_TYPE_CREATE_OBJECT,
                         AML_HAS_ARGS | AML_DEFER),
 /* 70 */ ACPI_OP("ConcatenateResTemplate", ARGP_CONCAT_RES_OP,
-                        ARGI_CONCAT_RES_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
+                ARGI_CONCAT_RES_OP, ACPI_TYPE_ANY,
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
 /* 71 */ ACPI_OP("Mod", ARGP_MOD_OP, ARGI_MOD_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
 /* 72 */ ACPI_OP("CreateQWordField", ARGP_CREATE_QWORD_FIELD_OP,
-                        ARGI_CREATE_QWORD_FIELD_OP,
-                        ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
-                        AML_TYPE_CREATE_FIELD,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
-                        AML_DEFER | AML_CREATE),
+                ARGI_CREATE_QWORD_FIELD_OP,
+                ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE,
+                AML_TYPE_CREATE_FIELD,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |
+                AML_DEFER | AML_CREATE),
 /* 73 */ ACPI_OP("ToBuffer", ARGP_TO_BUFFER_OP, ARGI_TO_BUFFER_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_1T_1R,
-                        AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_1T_1R,
+                AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 74 */ ACPI_OP("ToDecimalString", ARGP_TO_DEC_STR_OP,
-                        ARGI_TO_DEC_STR_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
-                        AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                ARGI_TO_DEC_STR_OP, ACPI_TYPE_ANY,
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R,
+                AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 75 */ ACPI_OP("ToHexString", ARGP_TO_HEX_STR_OP, ARGI_TO_HEX_STR_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_1T_1R,
-                        AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_1T_1R,
+                AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 76 */ ACPI_OP("ToInteger", ARGP_TO_INTEGER_OP, ARGI_TO_INTEGER_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_1T_1R,
-                        AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_1T_1R,
+                AML_FLAGS_EXEC_1A_1T_1R | AML_CONSTANT),
 /* 77 */ ACPI_OP("ToString", ARGP_TO_STRING_OP, ARGI_TO_STRING_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_2A_1T_1R,
-                        AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_2A_1T_1R,
+                AML_FLAGS_EXEC_2A_1T_1R | AML_CONSTANT),
 /* 78 */ ACPI_OP("CopyObject", ARGP_COPY_OP, ARGI_COPY_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R),
 /* 79 */ ACPI_OP("Mid", ARGP_MID_OP, ARGI_MID_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_3A_1T_1R,
-                        AML_FLAGS_EXEC_3A_1T_1R | AML_CONSTANT),
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_3A_1T_1R,
+                AML_FLAGS_EXEC_3A_1T_1R | AML_CONSTANT),
 /* 7A */ ACPI_OP("Continue", ARGP_CONTINUE_OP, ARGI_CONTINUE_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
+                ACPI_TYPE_ANY, AML_CLASS_CONTROL, AML_TYPE_CONTROL, 0),
 /* 7B */ ACPI_OP("LoadTable", ARGP_LOAD_TABLE_OP, ARGI_LOAD_TABLE_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
-                        AML_TYPE_EXEC_6A_0T_1R, AML_FLAGS_EXEC_6A_0T_1R),
+                ACPI_TYPE_ANY, AML_CLASS_EXECUTE,
+                AML_TYPE_EXEC_6A_0T_1R, AML_FLAGS_EXEC_6A_0T_1R),
 /* 7C */ ACPI_OP("DataTableRegion", ARGP_DATA_REGION_OP,
-                        ARGI_DATA_REGION_OP, ACPI_TYPE_REGION,
-                        AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_NSNODE | AML_NAMED),
+                ARGI_DATA_REGION_OP, ACPI_TYPE_REGION,
+                AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                AML_NSNODE | AML_NAMED),
 /* 7D */ ACPI_OP("[EvalSubTree]", ARGP_SCOPE_OP, ARGI_SCOPE_OP,
-                        ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
-                        AML_TYPE_NAMED_NO_OBJ,
-                        AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
-                        AML_NSNODE),
+                ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,
+                AML_TYPE_NAMED_NO_OBJ,
+                AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE),
 
 /* ACPI 3.0 opcodes */
 
 /* 7E */ ACPI_OP("Timer", ARGP_TIMER_OP, ARGI_TIMER_OP, ACPI_TYPE_ANY,
-                        AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R,
-                        AML_FLAGS_EXEC_0A_0T_1R)
+                AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R,
+                AML_FLAGS_EXEC_0A_0T_1R)
 
 /*! [End] no source code translation !*/
 };
index 8c6d3fdec38a7d08358a4cd7e60410b26510b5a8..0dd2ce8a3475d4c062a0a67941805fb29a3063ec 100644 (file)
@@ -567,7 +567,8 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
                                                     (*sub_object_list)->string.
                                                     length + 1);
                        } else {
-                               temp_size_needed += acpi_ns_get_pathname_length((*sub_object_list)->reference.node);
+                               temp_size_needed +=
+                                   acpi_ns_get_pathname_length((*sub_object_list)->reference.node);
                        }
                } else {
                        /*
index cc48ab05676c5ccefd1b342cd8532260c48d6470..50da494c3ee25f742ea67d3614c99812512299c1 100644 (file)
@@ -267,16 +267,19 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 * If BIOS erroneously reversed the _PRT source_name and source_index,
                 * then reverse them back.
                 */
-               if (ACPI_GET_OBJECT_TYPE (sub_object_list[3]) != ACPI_TYPE_INTEGER) {
+               if (ACPI_GET_OBJECT_TYPE(sub_object_list[3]) !=
+                   ACPI_TYPE_INTEGER) {
                        if (acpi_gbl_enable_interpreter_slack) {
                                source_name_index = 3;
                                source_index_index = 2;
-                               printk(KERN_WARNING "ACPI: Handling Garbled _PRT entry\n");
+                               printk(KERN_WARNING
+                                      "ACPI: Handling Garbled _PRT entry\n");
                        } else {
                                ACPI_ERROR((AE_INFO,
-                                       "(PRT[%X].source_index) Need Integer, found %s",
-                                       index,
-                                       acpi_ut_get_object_type_name(sub_object_list[3])));
+                                           "(PRT[%X].source_index) Need Integer, found %s",
+                                           index,
+                                           acpi_ut_get_object_type_name
+                                           (sub_object_list[3])));
                                return_ACPI_STATUS(AE_BAD_DATA);
                        }
                }
index de20a5d6decf52053f33c63909f0ebef7972a814..46da116a4030eacb57756273641f4395b3f002b7 100644 (file)
@@ -46,7 +46,6 @@
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsdump")
-
 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
 /* Local prototypes */
 static void acpi_rs_out_string(char *title, char *value);
@@ -489,10 +488,9 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                        /*
                         * Optional resource_source for Address resources
                         */
-                       acpi_rs_dump_resource_source(ACPI_CAST_PTR
-                                                    (struct
-                                                     acpi_resource_source,
-                                                     target));
+                       acpi_rs_dump_resource_source(ACPI_CAST_PTR(struct
+                                                                  acpi_resource_source,
+                                                                  target));
                        break;
 
                default:
index 7e3c335ab320a8aab6e26554921961fa93679289..2c2adb6292c160bfa68771b692a0f98ca316d97d 100644 (file)
@@ -142,7 +142,7 @@ struct acpi_rsdump_info *acpi_gbl_dump_resource_dispatch[] = {
 };
 #endif
 
-#endif /* ACPI_FUTURE_USAGE */
+#endif                         /* ACPI_FUTURE_USAGE */
 /*
  * Base sizes for external AML resource descriptors, indexed by internal type.
  * Includes size of the descriptor header (1 byte for small descriptors,
index a92755c8877d63fd57a12d6cb4f3747a14499f23..ca21e4660c79c8b4471a9ee41ec2cf058f96c7b9 100644 (file)
@@ -153,10 +153,9 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
 
                /* Perform the conversion */
 
-               status = acpi_rs_convert_resource_to_aml(resource,
-                                                        ACPI_CAST_PTR(union
-                                                                      aml_resource,
-                                                                      aml),
+               status = acpi_rs_convert_resource_to_aml(resource, ACPI_CAST_PTR(union
+                                                                                aml_resource,
+                                                                                aml),
                                                         acpi_gbl_set_resource_dispatch
                                                         [resource->type]);
                if (ACPI_FAILURE(status)) {
index 3b63b561b94e506291a7d91bb5a6468d867fa024..c7081afa893aeb22529ee2a8ea89bc39261b7eb9 100644 (file)
@@ -46,7 +46,6 @@
 
 #define _COMPONENT          ACPI_RESOURCES
 ACPI_MODULE_NAME("rsmisc")
-
 #define INIT_RESOURCE_TYPE(i)       i->resource_offset
 #define INIT_RESOURCE_LENGTH(i)     i->aml_offset
 #define INIT_TABLE_LENGTH(i)        i->value
@@ -429,8 +428,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                         * Optional resource_source (Index and String)
                         */
                        aml_length =
-                           acpi_rs_set_resource_source(aml,
-                                                       (acpi_rs_length)
+                           acpi_rs_set_resource_source(aml, (acpi_rs_length)
                                                        aml_length, source);
                        acpi_rs_set_resource_length(aml_length, aml);
                        break;
index 2442a8f8df576e240fb40323da8689655d1732b3..11c0bd7b9cfdea8272f374f51d127654586f0a0c 100644 (file)
@@ -353,10 +353,8 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length,
                 *
                 * Zero the entire area of the buffer.
                 */
-               total_length =
-                   (u32)
-                   ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) +
-                   1;
+               total_length = (u32)
+               ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) + 1;
                total_length = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(total_length);
 
                ACPI_MEMSET(resource_source->string_ptr, 0, total_length);
index 991f8901498c1166817c3922f982469932e07f5a..f63813a358c57f37b96c9c0517f5b37b9d63ce4c 100644 (file)
@@ -217,7 +217,6 @@ acpi_get_current_resources(acpi_handle device_handle,
 }
 
 ACPI_EXPORT_SYMBOL(acpi_get_current_resources)
-
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
  *
@@ -261,7 +260,6 @@ acpi_get_possible_resources(acpi_handle device_handle,
 
 ACPI_EXPORT_SYMBOL(acpi_get_possible_resources)
 #endif                         /*  ACPI_FUTURE_USAGE  */
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_set_current_resources
@@ -496,7 +494,6 @@ ACPI_EXPORT_SYMBOL(acpi_rs_match_vendor_resource)
  *              each resource in the list.
  *
  ******************************************************************************/
-
 acpi_status
 acpi_walk_resources(acpi_handle device_handle,
                    char *name,
index 52b23471dd69b08e01b868db425f2390ed5631b9..bc7e16ec839366725ff6f0bd6e8259bb7fb6bc33 100644 (file)
@@ -222,7 +222,7 @@ static struct hibernation_ops acpi_hibernation_ops = {
        .enter = acpi_hibernation_enter,
        .finish = acpi_hibernation_finish,
 };
-#endif /* CONFIG_SOFTWARE_SUSPEND */
+#endif                         /* CONFIG_SOFTWARE_SUSPEND */
 
 /*
  * Toshiba fails to preserve interrupts over S1, reinitialization
@@ -276,4 +276,3 @@ int __init acpi_sleep_init(void)
 
        return 0;
 }
-
index 76b45f0b8341c3c0979659cad0623cfb79bcb4e4..61f1822cc35050648c2958bf5b0de005f5920313 100644 (file)
@@ -349,8 +349,7 @@ acpi_system_write_alarm(struct file *file,
       end:
        return_VALUE(result ? result : count);
 }
-#endif /* HAVE_ACPI_LEGACY_ALARM */
-
+#endif                         /* HAVE_ACPI_LEGACY_ALARM */
 
 extern struct list_head acpi_wakeup_device_list;
 extern spinlock_t acpi_device_lock;
@@ -380,8 +379,8 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
                           dev->wakeup.state.enabled ? "enabled" : "disabled");
                if (ldev)
                        seq_printf(seq, "%s:%s",
-                               ldev->bus ? ldev->bus->name : "no-bus",
-                               ldev->bus_id);
+                                  ldev->bus ? ldev->bus->name : "no-bus",
+                                  ldev->bus_id);
                seq_printf(seq, "\n");
                put_device(ldev);
 
@@ -490,7 +489,7 @@ static u32 rtc_handler(void *context)
 
        return ACPI_INTERRUPT_HANDLED;
 }
-#endif /* HAVE_ACPI_LEGACY_ALARM */
+#endif                         /* HAVE_ACPI_LEGACY_ALARM */
 
 static int __init acpi_sleep_proc_init(void)
 {
@@ -517,7 +516,7 @@ static int __init acpi_sleep_proc_init(void)
                entry->proc_fops = &acpi_system_alarm_fops;
 
        acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL);
-#endif /* HAVE_ACPI_LEGACY_ALARM */
+#endif                         /* HAVE_ACPI_LEGACY_ALARM */
 
        /* 'wakeup device' [R/W] */
        entry =
index 1db833eb2417c5988890dc8ce4b62bed764e0d45..1285e91474fbff4c504d82e75ebe9b63c608eb24 100644 (file)
@@ -334,7 +334,8 @@ static void acpi_tb_convert_fadt(void)
                                     (acpi_gbl_FADT.xpm1a_event_block.address +
                                      pm1_register_length));
        /* Don't forget to copy space_id of the GAS */
-       acpi_gbl_xpm1a_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id;
+       acpi_gbl_xpm1a_enable.space_id =
+           acpi_gbl_FADT.xpm1a_event_block.space_id;
 
        /* The PM1B register block is optional, ignore if not present */
 
@@ -344,7 +345,8 @@ static void acpi_tb_convert_fadt(void)
                                             (acpi_gbl_FADT.xpm1b_event_block.
                                              address + pm1_register_length));
                /* Don't forget to copy space_id of the GAS */
-               acpi_gbl_xpm1b_enable.space_id = acpi_gbl_FADT.xpm1a_event_block.space_id;
+               acpi_gbl_xpm1b_enable.space_id =
+                   acpi_gbl_FADT.xpm1a_event_block.space_id;
 
        }
 
index 417ef5fa7666e4a09b49f25a764778778de84cd4..5b302c4e293f78dd734e9c322a6551f03c01b493 100644 (file)
@@ -201,6 +201,7 @@ acpi_status acpi_reallocate_root_table(void)
 
        return_ACPI_STATUS(AE_OK);
 }
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_load_table
@@ -262,7 +263,7 @@ ACPI_EXPORT_SYMBOL(acpi_load_table)
 acpi_status
 acpi_get_table_header(char *signature,
                      acpi_native_uint instance,
-                     struct acpi_table_header *out_table_header)
+                     struct acpi_table_header * out_table_header)
 {
        acpi_native_uint i;
        acpi_native_uint j;
@@ -321,7 +322,6 @@ acpi_get_table_header(char *signature,
 
 ACPI_EXPORT_SYMBOL(acpi_get_table_header)
 
-
 /******************************************************************************
  *
  * FUNCTION:    acpi_unload_table_id
@@ -346,11 +346,11 @@ acpi_status acpi_unload_table_id(acpi_owner_id id)
                        continue;
                }
                /*
-               * Delete all namespace objects owned by this table. Note that these
-               * objects can appear anywhere in the namespace by virtue of the AML
-               * "Scope" operator. Thus, we need to track ownership by an ID, not
-               * simply a position within the hierarchy
-               */
+                * Delete all namespace objects owned by this table. Note that these
+                * objects can appear anywhere in the namespace by virtue of the AML
+                * "Scope" operator. Thus, we need to track ownership by an ID, not
+                * simply a position within the hierarchy
+                */
                acpi_tb_delete_namespace_by_owner(i);
                status = acpi_tb_release_owner_id(i);
                acpi_tb_set_table_loaded_flag(i, FALSE);
@@ -376,7 +376,7 @@ ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
  *****************************************************************************/
 acpi_status
 acpi_get_table(char *signature,
-              acpi_native_uint instance, struct acpi_table_header ** out_table)
+              acpi_native_uint instance, struct acpi_table_header **out_table)
 {
        acpi_native_uint i;
        acpi_native_uint j;
index 589b98b7b216e5096b9cb74fee45d6ae4035a0c9..1ada017d01efb8c8d03630b7c87bd7b01565fd5b 100644 (file)
@@ -59,8 +59,6 @@
 #define ACPI_THERMAL_NOTIFY_CRITICAL   0xF0
 #define ACPI_THERMAL_NOTIFY_HOT                0xF1
 #define ACPI_THERMAL_MODE_ACTIVE       0x00
-#define ACPI_THERMAL_MODE_PASSIVE      0x01
-#define ACPI_THERMAL_MODE_CRITICAL     0xff
 #define ACPI_THERMAL_PATH_POWEROFF     "/sbin/poweroff"
 
 #define ACPI_THERMAL_MAX_ACTIVE        10
@@ -86,9 +84,6 @@ static int acpi_thermal_resume(struct acpi_device *device);
 static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file);
 static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file);
 static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file);
-static ssize_t acpi_thermal_write_trip_points(struct file *,
-                                             const char __user *, size_t,
-                                             loff_t *);
 static int acpi_thermal_cooling_open_fs(struct inode *inode, struct file *file);
 static ssize_t acpi_thermal_write_cooling_mode(struct file *,
                                               const char __user *, size_t,
@@ -167,7 +162,6 @@ struct acpi_thermal {
        unsigned long temperature;
        unsigned long last_temperature;
        unsigned long polling_frequency;
-       u8 cooling_mode;
        volatile u8 zombie;
        struct acpi_thermal_flags flags;
        struct acpi_thermal_state state;
@@ -193,7 +187,6 @@ static const struct file_operations acpi_thermal_temp_fops = {
 static const struct file_operations acpi_thermal_trip_fops = {
        .open = acpi_thermal_trip_open_fs,
        .read = seq_read,
-       .write = acpi_thermal_write_trip_points,
        .llseek = seq_lseek,
        .release = single_release,
 };
@@ -297,11 +290,6 @@ static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode)
        if (ACPI_FAILURE(status))
                return -ENODEV;
 
-       tz->cooling_mode = mode;
-
-       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Cooling mode [%s]\n",
-                         mode ? "passive" : "active"));
-
        return 0;
 }
 
@@ -889,67 +877,6 @@ static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file)
        return single_open(file, acpi_thermal_trip_seq_show, PDE(inode)->data);
 }
 
-static ssize_t
-acpi_thermal_write_trip_points(struct file *file,
-                              const char __user * buffer,
-                              size_t count, loff_t * ppos)
-{
-       struct seq_file *m = file->private_data;
-       struct acpi_thermal *tz = m->private;
-
-       char *limit_string;
-       int num, critical, hot, passive;
-       int *active;
-       int i = 0;
-
-
-       limit_string = kzalloc(ACPI_THERMAL_MAX_LIMIT_STR_LEN, GFP_KERNEL);
-       if (!limit_string)
-               return -ENOMEM;
-
-       active = kmalloc(ACPI_THERMAL_MAX_ACTIVE * sizeof(int), GFP_KERNEL);
-       if (!active) {
-               kfree(limit_string);
-               return -ENOMEM;
-       }
-
-       if (!tz || (count > ACPI_THERMAL_MAX_LIMIT_STR_LEN - 1)) {
-               count = -EINVAL;
-               goto end;
-       }
-
-       if (copy_from_user(limit_string, buffer, count)) {
-               count = -EFAULT;
-               goto end;
-       }
-
-       limit_string[count] = '\0';
-
-       num = sscanf(limit_string, "%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d:%d",
-                    &critical, &hot, &passive,
-                    &active[0], &active[1], &active[2], &active[3], &active[4],
-                    &active[5], &active[6], &active[7], &active[8],
-                    &active[9]);
-       if (!(num >= 5 && num < (ACPI_THERMAL_MAX_ACTIVE + 3))) {
-               count = -EINVAL;
-               goto end;
-       }
-
-       tz->trips.critical.temperature = CELSIUS_TO_KELVIN(critical);
-       tz->trips.hot.temperature = CELSIUS_TO_KELVIN(hot);
-       tz->trips.passive.temperature = CELSIUS_TO_KELVIN(passive);
-       for (i = 0; i < num - 3; i++) {
-               if (!(tz->trips.active[i].flags.valid))
-                       break;
-               tz->trips.active[i].temperature = CELSIUS_TO_KELVIN(active[i]);
-       }
-
-      end:
-       kfree(active);
-       kfree(limit_string);
-       return count;
-}
-
 static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)
 {
        struct acpi_thermal *tz = seq->private;
@@ -958,15 +885,10 @@ static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)
        if (!tz)
                goto end;
 
-       if (!tz->flags.cooling_mode) {
+       if (!tz->flags.cooling_mode)
                seq_puts(seq, "<setting not supported>\n");
-       }
-
-       if (tz->cooling_mode == ACPI_THERMAL_MODE_CRITICAL)
-               seq_printf(seq, "cooling mode:  critical\n");
        else
-               seq_printf(seq, "cooling mode:  %s\n",
-                          tz->cooling_mode ? "passive" : "active");
+               seq_puts(seq, "0 - Active; 1 - Passive\n");
 
       end:
        return 0;
@@ -1223,28 +1145,6 @@ static int acpi_thermal_get_info(struct acpi_thermal *tz)
        result = acpi_thermal_set_cooling_mode(tz, ACPI_THERMAL_MODE_ACTIVE);
        if (!result)
                tz->flags.cooling_mode = 1;
-       else {
-               /* Oh,we have not _SCP method.
-                  Generally show cooling_mode by _ACx, _PSV,spec 12.2 */
-               tz->flags.cooling_mode = 0;
-               if (tz->trips.active[0].flags.valid
-                   && tz->trips.passive.flags.valid) {
-                       if (tz->trips.passive.temperature >
-                           tz->trips.active[0].temperature)
-                               tz->cooling_mode = ACPI_THERMAL_MODE_ACTIVE;
-                       else
-                               tz->cooling_mode = ACPI_THERMAL_MODE_PASSIVE;
-               } else if (!tz->trips.active[0].flags.valid
-                          && tz->trips.passive.flags.valid) {
-                       tz->cooling_mode = ACPI_THERMAL_MODE_PASSIVE;
-               } else if (tz->trips.active[0].flags.valid
-                          && !tz->trips.passive.flags.valid) {
-                       tz->cooling_mode = ACPI_THERMAL_MODE_ACTIVE;
-               } else {
-                       /* _ACx and _PSV are optional, but _CRT is required */
-                       tz->cooling_mode = ACPI_THERMAL_MODE_CRITICAL;
-               }
-       }
 
        /* Get default polling frequency [_TZP] (optional) */
        if (tzp)
index 55a764807499800b9f95c69c09c6ebaf9452a712..6e56d5f7c43a05a9e4c1f9d90d16e3cd2c0111a6 100644 (file)
@@ -107,7 +107,6 @@ acpi_status acpi_ut_create_caches(void)
        if (ACPI_FAILURE(status)) {
                return (status);
        }
-
 #ifdef ACPI_DBG_TRACK_ALLOCATIONS
 
        /* Memory allocation lists */
index 870f6edeb5f28c6529889912c316459dcb1ae44e..285a0f5317604c21f088d273f611d53d9eff494d 100644 (file)
@@ -45,7 +45,6 @@
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utcache")
-
 #ifdef ACPI_USE_LOCAL_CACHE
 /*******************************************************************************
  *
@@ -64,7 +63,7 @@ ACPI_MODULE_NAME("utcache")
 acpi_status
 acpi_os_create_cache(char *cache_name,
                     u16 object_size,
-                    u16 max_depth, struct acpi_memory_list **return_cache)
+                    u16 max_depth, struct acpi_memory_list ** return_cache)
 {
        struct acpi_memory_list *cache;
 
index 84d529db0a6669234082d228ebc0f51f52a24f8f..4c1e00874dffab04407ddaf8975e7700d72dc5c5 100644 (file)
@@ -814,7 +814,9 @@ acpi_ut_copy_ielement_to_ielement(u8 object_type,
                /*
                 * Create the object array
                 */
-               target_object->package.elements = ACPI_ALLOCATE_ZEROED(((acpi_size) source_object->package.count + 1) * sizeof(void *));
+               target_object->package.elements =
+                   ACPI_ALLOCATE_ZEROED(((acpi_size) source_object->package.
+                                         count + 1) * sizeof(void *));
                if (!target_object->package.elements) {
                        status = AE_NO_MEMORY;
                        goto error_exit;
index 61ad4f2daee2e8e4c8761e87de68eb5442b69601..c7e128e5369b2d5853acf17e8ff109dc2d1fe021 100644 (file)
@@ -45,7 +45,6 @@
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utdebug")
-
 #ifdef ACPI_DEBUG_OUTPUT
 static acpi_thread_id acpi_gbl_prev_thread_id;
 static char *acpi_gbl_fn_entry_str = "----Entry";
@@ -181,7 +180,8 @@ acpi_ut_debug_print(u32 requested_debug_level,
                if (ACPI_LV_THREADS & acpi_dbg_level) {
                        acpi_os_printf
                            ("\n**** Context Switch from TID %lX to TID %lX ****\n\n",
-                            (unsigned long)acpi_gbl_prev_thread_id, (unsigned long)thread_id);
+                            (unsigned long)acpi_gbl_prev_thread_id,
+                            (unsigned long)thread_id);
                }
 
                acpi_gbl_prev_thread_id = thread_id;
index 673a0caa4073438f3f22af2dcad6a6e9f4bdc029..f777cebdc46dd85f8ec66b491096f9d2f20af1a3 100644 (file)
@@ -170,6 +170,7 @@ static void acpi_ut_delete_internal_obj(union acpi_operand_object *object)
                        acpi_os_delete_mutex(object->mutex.os_mutex);
                        acpi_gbl_global_lock_mutex = NULL;
                } else {
+                       acpi_ex_unlink_mutex(object);
                        acpi_os_delete_mutex(object->mutex.os_mutex);
                }
                break;
index af33358a964b81f25ad0c404f61838ddbd1ba145..1621655d6e2b331e23bd9beaf56e59fab7298e8d 100644 (file)
@@ -55,12 +55,10 @@ ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)
  * Static global variable initialization.
  *
  ******************************************************************************/
-
 /*
  * We want the debug switches statically initialized so they
  * are already set when the debugger is entered.
  */
-
 /* Debug switch - level and trace mask */
 u32 acpi_dbg_level = ACPI_DEBUG_DEFAULT;
 
@@ -735,5 +733,5 @@ void acpi_ut_init_globals(void)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_dbg_level)
-ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
-ACPI_EXPORT_SYMBOL(acpi_gpe_count)
+    ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
+    ACPI_EXPORT_SYMBOL(acpi_gpe_count)
index 50133fffe42045f7b1155e2edb8edd2ca6900529..2d19f71e9cfa44c95b1588a484f622d549340444 100644 (file)
@@ -802,9 +802,8 @@ acpi_ut_strtoul64(char *string, u32 base, acpi_integer * ret_integer)
 
                valid_digits++;
 
-               if (sign_of0x
-                   && ((valid_digits > 16)
-                       || ((valid_digits > 8) && mode32))) {
+               if (sign_of0x && ((valid_digits > 16)
+                                 || ((valid_digits > 8) && mode32))) {
                        /*
                         * This is to_integer operation case.
                         * No any restrictions for string-to-integer conversion,
@@ -1049,6 +1048,7 @@ acpi_ut_exception(char *module_name,
        acpi_os_vprintf(format, args);
        acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);
 }
+
 EXPORT_SYMBOL(acpi_ut_exception);
 
 void ACPI_INTERNAL_VAR_XFACE
index cbad2ef5987d1a52e9f89c3bd78a1c180447d33d..4820bc86d1f5d44ec1e90e07332e93a57974a0ce 100644 (file)
@@ -244,7 +244,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
 
        ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
                          "Thread %lX attempting to acquire Mutex [%s]\n",
-                         (unsigned long) this_thread_id,
+                         (unsigned long)this_thread_id,
                          acpi_ut_get_mutex_name(mutex_id)));
 
        status = acpi_os_acquire_mutex(acpi_gbl_mutex_info[mutex_id].mutex,
@@ -252,7 +252,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
        if (ACPI_SUCCESS(status)) {
                ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
                                  "Thread %lX acquired Mutex [%s]\n",
-                                 (unsigned long) this_thread_id,
+                                 (unsigned long)this_thread_id,
                                  acpi_ut_get_mutex_name(mutex_id)));
 
                acpi_gbl_mutex_info[mutex_id].use_count++;
@@ -260,7 +260,7 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
        } else {
                ACPI_EXCEPTION((AE_INFO, status,
                                "Thread %lX could not acquire Mutex [%X]",
-                               (unsigned long) this_thread_id, mutex_id));
+                               (unsigned long)this_thread_id, mutex_id));
        }
 
        return (status);
@@ -287,7 +287,7 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
        this_thread_id = acpi_os_get_thread_id();
        ACPI_DEBUG_PRINT((ACPI_DB_MUTEX,
                          "Thread %lX releasing Mutex [%s]\n",
-                         (unsigned long) this_thread_id,
+                         (unsigned long)this_thread_id,
                          acpi_ut_get_mutex_name(mutex_id)));
 
        if (mutex_id > ACPI_MAX_MUTEX) {
index e8fe1ba6cc243f705caf9c940d472b9846dc7e46..cbbd3315a1e22bbc9eacc32942ccaded198c14a7 100644 (file)
@@ -46,7 +46,6 @@
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utresrc")
-
 #if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
 /*
  * Strings used to decode resource descriptors.
index de3276f4f4683ec4aee9fb4a794ec9ace654636f..e9a57806cd34ecc32c1ab9d9881efabbeb96bfbc 100644 (file)
@@ -337,7 +337,6 @@ acpi_status acpi_terminate(void)
 }
 
 ACPI_EXPORT_SYMBOL(acpi_terminate)
-
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
  *
@@ -470,7 +469,6 @@ acpi_install_initialization_handler(acpi_init_handler handler, u32 function)
 
 ACPI_EXPORT_SYMBOL(acpi_install_initialization_handler)
 #endif                         /*  ACPI_FUTURE_USAGE  */
-
 /*****************************************************************************
  *
  * FUNCTION:    acpi_purge_cached_objects
index cb8d2868c8ac3520ba07a12cbf9c93101c53c634..7f690bb0f02f1c8e8d2356c8ca2daa26b2e9e2af 100644 (file)
@@ -290,12 +290,9 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state *walk_state);
 acpi_status
 acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state *walk_state);
 
-struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
-                                                 union acpi_parse_object
-                                                 *origin,
-                                                 union acpi_operand_object
-                                                 *mth_desc,
-                                                 struct acpi_thread_state
+struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id, union acpi_parse_object
+                                                 *origin, union acpi_operand_object
+                                                 *mth_desc, struct acpi_thread_state
                                                  *thread);
 
 acpi_status
index 24c3f05ab367ce92adf664a369c780550d2e5315..347a911d8237828d4e49b154a2d594081d789f4b 100644 (file)
@@ -319,7 +319,7 @@ ACPI_EXTERN struct acpi_fixed_event_handler
     acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS];
 ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head;
 ACPI_EXTERN struct acpi_gpe_block_info
-    *acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS];
+*acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS];
 
 /*****************************************************************************
  *
index 440983019993def8c5e3352b091892be11c6d288..ce7c9d653910598c29cce2baa2dcbb28b8cbb83b 100644 (file)
@@ -253,8 +253,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
 
 void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread);
 
-void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc,
-                         struct acpi_thread_state *thread);
+void acpi_ex_unlink_mutex(union acpi_operand_object *obj_desc);
 
 /*
  * exprep - ACPI AML execution - prep utilities
@@ -446,10 +445,14 @@ acpi_ex_copy_integer_to_buffer_field(union acpi_operand_object *source_desc,
 /*
  * exutils - interpreter/scanner utilities
  */
-acpi_status acpi_ex_enter_interpreter(void);
+void acpi_ex_enter_interpreter(void);
 
 void acpi_ex_exit_interpreter(void);
 
+void acpi_ex_reacquire_interpreter(void);
+
+void acpi_ex_relinquish_interpreter(void);
+
 void acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc);
 
 u8 acpi_ex_acquire_global_lock(u32 rule);
index 6f83ddbed3af75117c84c741548556344462e389..202cd4242ba19bd135ac64877a954376e16f79c7 100644 (file)
@@ -630,7 +630,7 @@ ACPI_PARSE_COMMON};
  * and bytelists.
  */
 struct acpi_parse_obj_named {
-       ACPI_PARSE_COMMON u8 * path;
+       ACPI_PARSE_COMMON u8 *path;
        u8 *data;               /* AML body or bytelist data */
        u32 length;             /* AML length */
        u32 name;               /* 4-byte name or zero if no name */
index 535b7e1c41bcc12657d768136470901ca9184dd7..5ef38a6c8a6154c3c4dc0a29c347a6e10b98079e 100644 (file)
@@ -100,10 +100,8 @@ acpi_ns_walk_namespace(acpi_object_type type,
                       acpi_walk_callback user_function,
                       void *context, void **return_value);
 
-struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type,
-                                                 struct acpi_namespace_node
-                                                 *parent,
-                                                 struct acpi_namespace_node
+struct acpi_namespace_node *acpi_ns_get_next_node(acpi_object_type type, struct acpi_namespace_node
+                                                 *parent, struct acpi_namespace_node
                                                  *child);
 
 /*
index 5206d61d74a6039eac0852145eb956b842554d6a..7e1211a8b8faf5f84710586a7130d8abfb0fa673 100644 (file)
@@ -155,7 +155,7 @@ struct acpi_object_event {
 struct acpi_object_mutex {
        ACPI_OBJECT_COMMON_HEADER u8 sync_level;        /* 0-15, specified in Mutex() call */
        u16 acquisition_depth;  /* Allow multiple Acquires, same thread */
-       acpi_thread_id owner_thread_id; /* Current owner of the mutex */
+       struct acpi_thread_state *owner_thread; /* Current owner of the mutex */
        acpi_mutex os_mutex;    /* Actual OS synchronization object */
        union acpi_operand_object *prev;        /* Link for list of acquired mutexes */
        union acpi_operand_object *next;        /* Link for list of acquired mutexes */
@@ -216,7 +216,7 @@ struct acpi_object_processor {
            /* The next two fields take advantage of the 3-byte space before NOTIFY_INFO */
        u8 proc_id;
        u8 length;
-        ACPI_COMMON_NOTIFY_INFO acpi_io_address address;
+       ACPI_COMMON_NOTIFY_INFO acpi_io_address address;
 };
 
 struct acpi_object_thermal_zone {
index 9cfd5b1a48eb8e9a42df7bb02009d4d3abb0eca8..c6fa5e023bc78289b92cb4d5b5da5d94f3df0266 100644 (file)
@@ -91,7 +91,8 @@ typedef int (*acpi_op_remove) (struct acpi_device * device, int type);
 typedef int (*acpi_op_lock) (struct acpi_device * device, int type);
 typedef int (*acpi_op_start) (struct acpi_device * device);
 typedef int (*acpi_op_stop) (struct acpi_device * device, int type);
-typedef int (*acpi_op_suspend) (struct acpi_device * device, pm_message_t state);
+typedef int (*acpi_op_suspend) (struct acpi_device * device,
+                               pm_message_t state);
 typedef int (*acpi_op_resume) (struct acpi_device * device);
 typedef int (*acpi_op_scan) (struct acpi_device * device);
 typedef int (*acpi_op_bind) (struct acpi_device * device);
@@ -296,7 +297,7 @@ struct acpi_device {
        void *driver_data;
        struct device dev;
        struct acpi_bus_ops bus_ops;    /* workaround for different code path for hotplug */
-       enum acpi_bus_removal_type removal_type; /* indicate for different removal type */
+       enum acpi_bus_removal_type removal_type;        /* indicate for different removal type */
 };
 
 #define acpi_driver_data(d)    ((d)->driver_data)
@@ -338,7 +339,7 @@ int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent,
                 acpi_handle handle, int type);
 int acpi_bus_trim(struct acpi_device *start, int rmdevice);
 int acpi_bus_start(struct acpi_device *device);
-acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle *ejd);
+acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd);
 int acpi_match_ids(struct acpi_device *device, char *ids);
 int acpi_create_dir(struct acpi_device *);
 void acpi_remove_dir(struct acpi_device *);
@@ -363,6 +364,6 @@ acpi_handle acpi_get_child(acpi_handle, acpi_integer);
 acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int);
 #define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle))
 
-#endif /* CONFIG_ACPI */
+#endif                         /* CONFIG_ACPI */
 
 #endif /*__ACPI_BUS_H__*/
index f6275b0e66dd34bbd5e3fde2be186eeda43ebba4..553515912c0bf3356b8b2185b2dba76a380e1d49 100644 (file)
@@ -113,7 +113,8 @@ extern int is_dock_device(acpi_handle handle);
 extern int register_dock_notifier(struct notifier_block *nb);
 extern void unregister_dock_notifier(struct notifier_block *nb);
 extern int register_hotplug_dock_device(acpi_handle handle,
-       acpi_notify_handler handler, void *context);
+                                       acpi_notify_handler handler,
+                                       void *context);
 extern void unregister_hotplug_dock_device(acpi_handle handle);
 #else
 static inline int is_dock_device(acpi_handle handle)
@@ -128,7 +129,8 @@ static inline void unregister_dock_notifier(struct notifier_block *nb)
 {
 }
 static inline int register_hotplug_dock_device(acpi_handle handle,
-                               acpi_notify_handler handler, void *context)
+                                              acpi_notify_handler handler,
+                                              void *context)
 {
        return -ENODEV;
 }
index 1049f2a0a6dbf6f7a25b514ac0b08ba8bdb99095..f9d2bde9a7bbac44dd46fde43eff9e95bc4e4e2f 100644 (file)
@@ -8,7 +8,7 @@
 #if MAX_NUMNODES > 256
 #define MAX_PXM_DOMAINS MAX_NUMNODES
 #else
-#define MAX_PXM_DOMAINS (256) /* Old pxm spec is defined 8 bit */
+#define MAX_PXM_DOMAINS (256)  /* Old pxm spec is defined 8 bit */
 #endif
 
 extern int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS];
index 2785058c82ab0621991b54a243473e49ff3bc2a8..5e07db0d46e9997752161028ed0e4e4dc26e2219 100644 (file)
@@ -143,7 +143,8 @@ void acpi_os_release_mutex(acpi_mutex handle);
  */
 void *acpi_os_allocate(acpi_size size);
 
-void __iomem *acpi_os_map_memory(acpi_physical_address where, acpi_native_uint length);
+void __iomem *acpi_os_map_memory(acpi_physical_address where,
+                                acpi_native_uint length);
 
 void acpi_os_unmap_memory(void __iomem * logical_address, acpi_size size);
 
index 56bf492e7acc819e7718e6cc13dd85b3b206560a..fe8abc2764370ed22204a0c05e7eeee1faea138a 100644 (file)
@@ -344,7 +344,7 @@ typedef u32 acpi_integer;
 
 /* 64-bit integers */
 
-typedef unsigned long long              acpi_integer;
+typedef unsigned long long acpi_integer;
 #define ACPI_INTEGER_MAX                ACPI_UINT64_MAX
 #define ACPI_INTEGER_BIT_SIZE           64
 #define ACPI_MAX_DECIMAL_DIGITS         20     /* 2^64 = 18,446,744,073,709,551,616 */
index 883ffe92148ff1651f2b2e36aadc0628f76f57ec..15a838862cd4c33a6646f5dd6e1ef6ae1e34aa4f 100644 (file)
@@ -498,7 +498,8 @@ acpi_ut_display_init_pathname(u8 type,
 acpi_status
 acpi_ut_walk_aml_resources(u8 * aml,
                           acpi_size aml_length,
-                          acpi_walk_aml_callback user_function, void **context);
+                          acpi_walk_aml_callback user_function,
+                          void **context);
 
 acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index);
 
index 5f532d2ac180518fdd3c9c579f43e70b5f2d73a2..a568717f98c6dcbbeb1808fc329b167caafacf7b 100644 (file)
 
 #define acpi_thread_id struct task_struct *
 
-static inline acpi_thread_id acpi_os_get_thread_id(void) { return current; }
+static inline acpi_thread_id acpi_os_get_thread_id(void)
+{
+       return current;
+}
 
 /*
  * The irqs_disabled() check is for resume from RAM.
@@ -112,15 +115,19 @@ static inline acpi_thread_id acpi_os_get_thread_id(void) { return current; }
  * to quiet __might_sleep() in kmalloc() and resume does not.
  */
 #include <acpi/actypes.h>
-static inline void *acpi_os_allocate(acpi_size size) {
-       return kmalloc(size, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL);
+static inline void *acpi_os_allocate(acpi_size size)
+{
+       return kmalloc(size, irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);
 }
-static inline void *acpi_os_allocate_zeroed(acpi_size size) {
-       return kzalloc(size, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL);
+static inline void *acpi_os_allocate_zeroed(acpi_size size)
+{
+       return kzalloc(size, irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);
 }
 
-static inline void *acpi_os_acquire_object(acpi_cache_t * cache) {
-        return kmem_cache_zalloc(cache, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL);
+static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
+{
+       return kmem_cache_zalloc(cache,
+                                irqs_disabled()? GFP_ATOMIC : GFP_KERNEL);
 }
 
 #define ACPI_ALLOCATE(a)       acpi_os_allocate(a)
index 916c0102db5be85430791c1b5c575cbee888be98..b4b0ffdab098f50c5e1bb44f12400150e8ff923c 100644 (file)
@@ -18,7 +18,7 @@
 
 #define ACPI_PDC_REVISION_ID           0x1
 
-#define ACPI_PSD_REV0_REVISION         0 /* Support for _PSD as in ACPI 3.0 */
+#define ACPI_PSD_REV0_REVISION         0       /* Support for _PSD as in ACPI 3.0 */
 #define ACPI_PSD_REV0_ENTRIES          5
 
 /*
@@ -189,8 +189,9 @@ struct acpi_processor_errata {
        } piix4;
 };
 
-extern int acpi_processor_preregister_performance(
-               struct acpi_processor_performance **performance);
+extern int acpi_processor_preregister_performance(struct
+                                                 acpi_processor_performance
+                                                 **performance);
 
 extern int acpi_processor_register_performance(struct acpi_processor_performance
                                               *performance, unsigned int cpu);
@@ -213,7 +214,8 @@ void arch_acpi_processor_init_pdc(struct acpi_processor *pr);
 void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags,
                                        unsigned int cpu);
 int acpi_processor_ffh_cstate_probe(unsigned int cpu,
-               struct acpi_processor_cx *cx, struct acpi_power_register *reg);
+                                   struct acpi_processor_cx *cx,
+                                   struct acpi_power_register *reg);
 void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cstate);
 #else
 static inline void acpi_processor_power_init_bm_check(struct
@@ -224,12 +226,14 @@ static inline void acpi_processor_power_init_bm_check(struct
        return;
 }
 static inline int acpi_processor_ffh_cstate_probe(unsigned int cpu,
-               struct acpi_processor_cx *cx, struct acpi_power_register *reg)
+                                                 struct acpi_processor_cx *cx,
+                                                 struct acpi_power_register
+                                                 *reg)
 {
        return -1;
 }
-static inline void acpi_processor_ffh_cstate_enter(
-               struct acpi_processor_cx *cstate)
+static inline void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx
+                                                  *cstate)
 {
        return;
 }