114 files changed, 4167 insertions, 883 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 119d58db8342..0300bf612946 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -181,6 +181,12 @@ config ACPI_DOCK
           This driver supports ACPI-controlled docking stations and removable
           drive bays such as the IBM Ultrabay and the Dell Module Bay.
 
+config ACPI_I2C
+        def_tristate I2C
+        depends on I2C
+        help
+          ACPI I2C enumeration support.
+
 config ACPI_PROCESSOR
         tristate "Processor"
         select THERMAL
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 82422fe90f81..2a4502becd13 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -21,9 +21,10 @@ obj-y				+= acpi.o \
 acpi-y                          += osl.o utils.o reboot.o
 acpi-y                          += nvs.o
 
-# sleep related files
+# Power management related files
 acpi-y                          += wakeup.o
 acpi-y                          += sleep.o
+acpi-$(CONFIG_PM)               += device_pm.o
 acpi-$(CONFIG_ACPI_SLEEP)       += proc.o
 
 
@@ -32,10 +33,12 @@ acpi-$(CONFIG_ACPI_SLEEP)	+= proc.o
 #
 acpi-y                          += bus.o glue.o
 acpi-y                          += scan.o
+acpi-y                          += resource.o
 acpi-y                          += processor_core.o
 acpi-y                          += ec.o
 acpi-$(CONFIG_ACPI_DOCK)        += dock.o
 acpi-y                          += pci_root.o pci_link.o pci_irq.o pci_bind.o
+acpi-y                          += acpi_platform.o
 acpi-y                          += power.o
 acpi-y                          += event.o
 acpi-y                          += sysfs.o
@@ -67,6 +70,7 @@ obj-$(CONFIG_ACPI_HED)		+= hed.o
 obj-$(CONFIG_ACPI_EC_DEBUGFS)   += ec_sys.o
 obj-$(CONFIG_ACPI_CUSTOM_METHOD)+= custom_method.o
 obj-$(CONFIG_ACPI_BGRT)         += bgrt.o
+obj-$(CONFIG_ACPI_I2C)          += acpi_i2c.o
 
 # processor has its own "processor." module_param namespace
 processor-y                     := processor_driver.o processor_throttling.o
diff --git a/drivers/acpi/acpi_i2c.c b/drivers/acpi/acpi_i2c.c
new file mode 100644
index 000000000000..82045e3f5cac
--- /dev/null
+++ b/drivers/acpi/acpi_i2c.c
@@ -0,0 +1,103 @@
+/*
+ * ACPI I2C enumeration support
+ *
+ * Copyright (C) 2012, Intel Corporation
+ * Author: Mika Westerberg <mika.westerberg@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/device.h>
+#include <linux/export.h>
+#include <linux/i2c.h>
+#include <linux/ioport.h>
+
+ACPI_MODULE_NAME("i2c");
+
+static int acpi_i2c_add_resource(struct acpi_resource *ares, void *data)
+{
+        struct i2c_board_info *info = data;
+
+        if (ares->type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {
+                struct acpi_resource_i2c_serialbus *sb;
+
+                sb = &ares->data.i2c_serial_bus;
+                if (sb->type == ACPI_RESOURCE_SERIAL_TYPE_I2C) {
+                        info->addr = sb->slave_address;
+                        if (sb->access_mode == ACPI_I2C_10BIT_MODE)
+                                info->flags |= I2C_CLIENT_TEN;
+                }
+        } else if (info->irq < 0) {
+                struct resource r;
+
+                if (acpi_dev_resource_interrupt(ares, 0, &r))
+                        info->irq = r.start;
+        }
+
+        /* Tell the ACPI core to skip this resource */
+        return 1;
+}
+
+static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level,
+                                       void *data, void **return_value)
+{
+        struct i2c_adapter *adapter = data;
+        struct list_head resource_list;
+        struct i2c_board_info info;
+        struct acpi_device *adev;
+        int ret;
+
+        if (acpi_bus_get_device(handle, &adev))
+                return AE_OK;
+        if (acpi_bus_get_status(adev) || !adev->status.present)
+                return AE_OK;
+
+        memset(&info, 0, sizeof(info));
+        info.acpi_node.handle = handle;
+        info.irq = -1;
+
+        INIT_LIST_HEAD(&resource_list);
+        ret = acpi_dev_get_resources(adev, &resource_list,
+                                     acpi_i2c_add_resource, &info);
+        acpi_dev_free_resource_list(&resource_list);
+
+        if (ret < 0 || !info.addr)
+                return AE_OK;
+
+        strlcpy(info.type, dev_name(&adev->dev), sizeof(info.type));
+        if (!i2c_new_device(adapter, &info)) {
+                dev_err(&adapter->dev,
+                        "failed to add I2C device %s from ACPI\n",
+                        dev_name(&adev->dev));
+        }
+
+        return AE_OK;
+}
+
+/**
+ * acpi_i2c_register_devices - enumerate I2C slave devices behind adapter
+ * @adapter: pointer to adapter
+ *
+ * Enumerate all I2C slave devices behind this adapter by walking the ACPI
+ * namespace. When a device is found it will be added to the Linux device
+ * model and bound to the corresponding ACPI handle.
+ */
+void acpi_i2c_register_devices(struct i2c_adapter *adapter)
+{
+        acpi_handle handle;
+        acpi_status status;
+
+        handle = ACPI_HANDLE(&adapter->dev);
+        if (!handle)
+                return;
+
+        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, 1,
+                                     acpi_i2c_add_device, NULL,
+                                     adapter, NULL);
+        if (ACPI_FAILURE(status))
+                dev_warn(&adapter->dev, "failed to enumerate I2C slaves\n");
+}
+EXPORT_SYMBOL_GPL(acpi_i2c_register_devices);
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
new file mode 100644
index 000000000000..db129b9f52cb
--- /dev/null
+++ b/drivers/acpi/acpi_platform.c
@@ -0,0 +1,104 @@
+/*
+ * ACPI support for platform bus type.
+ *
+ * Copyright (C) 2012, Intel Corporation
+ * Authors: Mika Westerberg <mika.westerberg@linux.intel.com>
+ *          Mathias Nyman <mathias.nyman@linux.intel.com>
+ *          Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include "internal.h"
+
+ACPI_MODULE_NAME("platform");
+
+/**
+ * acpi_create_platform_device - Create platform device for ACPI device node
+ * @adev: ACPI device node to create a platform device for.
+ *
+ * Check if the given @adev can be represented as a platform device and, if
+ * that's the case, create and register a platform device, populate its common
+ * resources and returns a pointer to it.  Otherwise, return %NULL.
+ *
+ * The platform device's name will be taken from the @adev's _HID and _UID.
+ */
+struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
+{
+        struct platform_device *pdev = NULL;
+        struct acpi_device *acpi_parent;
+        struct platform_device_info pdevinfo;
+        struct resource_list_entry *rentry;
+        struct list_head resource_list;
+        struct resource *resources;
+        int count;
+
+        /* If the ACPI node already has a physical device attached, skip it. */
+        if (adev->physical_node_count)
+                return NULL;
+
+        INIT_LIST_HEAD(&resource_list);
+        count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
+        if (count <= 0)
+                return NULL;
+
+        resources = kmalloc(count * sizeof(struct resource), GFP_KERNEL);
+        if (!resources) {
+                dev_err(&adev->dev, "No memory for resources\n");
+                acpi_dev_free_resource_list(&resource_list);
+                return NULL;
+        }
+        count = 0;
+        list_for_each_entry(rentry, &resource_list, node)
+                resources[count++] = rentry->res;
+
+        acpi_dev_free_resource_list(&resource_list);
+
+        memset(&pdevinfo, 0, sizeof(pdevinfo));
+        /*
+         * If the ACPI node has a parent and that parent has a physical device
+         * attached to it, that physical device should be the parent of the
+         * platform device we are about to create.
+         */
+        pdevinfo.parent = NULL;
+        acpi_parent = adev->parent;
+        if (acpi_parent) {
+                struct acpi_device_physical_node *entry;
+                struct list_head *list;
+
+                mutex_lock(&acpi_parent->physical_node_lock);
+                list = &acpi_parent->physical_node_list;
+                if (!list_empty(list)) {
+                        entry = list_first_entry(list,
+                                        struct acpi_device_physical_node,
+                                        node);
+                        pdevinfo.parent = entry->dev;
+                }
+                mutex_unlock(&acpi_parent->physical_node_lock);
+        }
+        pdevinfo.name = dev_name(&adev->dev);
+        pdevinfo.id = -1;
+        pdevinfo.res = resources;
+        pdevinfo.num_res = count;
+        pdevinfo.acpi_node.handle = adev->handle;
+        pdev = platform_device_register_full(&pdevinfo);
+        if (IS_ERR(pdev)) {
+                dev_err(&adev->dev, "platform device creation failed: %ld\n",
+                        PTR_ERR(pdev));
+                pdev = NULL;
+        } else {
+                dev_dbg(&adev->dev, "created platform device %s\n",
+                        dev_name(&pdev->dev));
+        }
+
+        kfree(resources);
+        return pdev;
+}
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index 7f1d40797e80..c8bc24bd1f72 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -161,3 +161,6 @@ acpi-y +=		\
         utxfinit.o      \
         utxferror.o     \
         utxfmutex.o
+
+acpi-$(ACPI_FUTURE_USAGE) += uttrack.o utcache.o utclib.o
+
diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index 5e8abb07724f..432a318c9ed1 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -44,17 +44,28 @@
 #ifndef __ACDEBUG_H__
 #define __ACDEBUG_H__
 
-#define ACPI_DEBUG_BUFFER_SIZE  4196
+#define ACPI_DEBUG_BUFFER_SIZE  0x4000  /* 16K buffer for return objects */
 
-struct command_info {
+struct acpi_db_command_info {
         char *name;             /* Command Name */
         u8 min_args;            /* Minimum arguments required */
 };
 
-struct argument_info {
+struct acpi_db_command_help {
+        u8 line_count;          /* Number of help lines */
+        char *invocation;       /* Command Invocation */
+        char *description;      /* Command Description */
+};
+
+struct acpi_db_argument_info {
         char *name;             /* Argument Name */
 };
 
+struct acpi_db_execute_walk {
+        u32 count;
+        u32 max_count;
+};
+
 #define PARAM_LIST(pl)                  pl
 #define DBTEST_OUTPUT_LEVEL(lvl)        if (acpi_gbl_db_opt_verbose)
 #define VERBOSE_PRINT(fp)               DBTEST_OUTPUT_LEVEL(lvl) {\
@@ -77,59 +88,71 @@ acpi_db_single_step(struct acpi_walk_state *walk_state,
 /*
  * dbcmds - debug commands and output routines
  */
-acpi_status acpi_db_disassemble_method(char *name);
+struct acpi_namespace_node *acpi_db_convert_to_node(char *in_string);
 
 void acpi_db_display_table_info(char *table_arg);
 
-void acpi_db_unload_acpi_table(char *table_arg, char *instance_arg);
+void acpi_db_display_template(char *buffer_arg);
 
-void
-acpi_db_set_method_breakpoint(char *location,
-                              struct acpi_walk_state *walk_state,
-                              union acpi_parse_object *op);
+void acpi_db_unload_acpi_table(char *name);
 
-void acpi_db_set_method_call_breakpoint(union acpi_parse_object *op);
+void acpi_db_send_notify(char *name, u32 value);
 
-void acpi_db_get_bus_info(void);
+void acpi_db_display_interfaces(char *action_arg, char *interface_name_arg);
 
-void acpi_db_disassemble_aml(char *statements, union acpi_parse_object *op);
+acpi_status acpi_db_sleep(char *object_arg);
 
-void acpi_db_dump_namespace(char *start_arg, char *depth_arg);
+void acpi_db_display_locks(void);
 
-void acpi_db_dump_namespace_by_owner(char *owner_arg, char *depth_arg);
+void acpi_db_display_resources(char *object_arg);
 
-void acpi_db_send_notify(char *name, u32 value);
+ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_db_display_gpes(void))
+
+void acpi_db_display_handlers(void);
+
+ACPI_HW_DEPENDENT_RETURN_VOID(void
+                              acpi_db_generate_gpe(char *gpe_arg,
+                                                   char *block_arg))
+
+/*
+ * dbmethod - control method commands
+ */
+void
+acpi_db_set_method_breakpoint(char *location,
+                              struct acpi_walk_state *walk_state,
+                              union acpi_parse_object *op);
+
+void acpi_db_set_method_call_breakpoint(union acpi_parse_object *op);
 
 void acpi_db_set_method_data(char *type_arg, char *index_arg, char *value_arg);
 
-acpi_status
-acpi_db_display_objects(char *obj_type_arg, char *display_count_arg);
+acpi_status acpi_db_disassemble_method(char *name);
 
-void acpi_db_display_interfaces(char *action_arg, char *interface_name_arg);
+void acpi_db_disassemble_aml(char *statements, union acpi_parse_object *op);
 
-acpi_status acpi_db_find_name_in_namespace(char *name_arg);
+void acpi_db_batch_execute(char *count_arg);
 
+/*
+ * dbnames - namespace commands
+ */
 void acpi_db_set_scope(char *name);
 
-ACPI_HW_DEPENDENT_RETURN_OK(acpi_status acpi_db_sleep(char *object_arg))
+void acpi_db_dump_namespace(char *start_arg, char *depth_arg);
 
-void acpi_db_find_references(char *object_arg);
+void acpi_db_dump_namespace_by_owner(char *owner_arg, char *depth_arg);
 
-void acpi_db_display_locks(void);
+acpi_status acpi_db_find_name_in_namespace(char *name_arg);
 
-void acpi_db_display_resources(char *object_arg);
+void acpi_db_check_predefined_names(void);
 
-ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_db_display_gpes(void))
+acpi_status
+acpi_db_display_objects(char *obj_type_arg, char *display_count_arg);
 
 void acpi_db_check_integrity(void);
 
-ACPI_HW_DEPENDENT_RETURN_VOID(void
-                              acpi_db_generate_gpe(char *gpe_arg,
-                                                   char *block_arg))
-
-void acpi_db_check_predefined_names(void);
+void acpi_db_find_references(char *object_arg);
 
-void acpi_db_batch_execute(void);
+void acpi_db_get_bus_info(void);
 
 /*
  * dbdisply - debug display commands
@@ -161,7 +184,8 @@ acpi_db_display_argument_object(union acpi_operand_object *obj_desc,
 /*
  * dbexec - debugger control method execution
  */
-void acpi_db_execute(char *name, char **args, u32 flags);
+void
+acpi_db_execute(char *name, char **args, acpi_object_type * types, u32 flags);
 
 void
 acpi_db_create_execution_threads(char *num_threads_arg,
@@ -175,7 +199,8 @@ u32 acpi_db_get_cache_info(struct acpi_memory_list *cache);
  * dbfileio - Debugger file I/O commands
  */
 acpi_object_type
-acpi_db_match_argument(char *user_argument, struct argument_info *arguments);
+acpi_db_match_argument(char *user_argument,
+                       struct acpi_db_argument_info *arguments);
 
 void acpi_db_close_debug_file(void);
 
@@ -208,6 +233,11 @@ acpi_db_command_dispatch(char *input_buffer,
 
 void ACPI_SYSTEM_XFACE acpi_db_execute_thread(void *context);
 
+acpi_status acpi_db_user_commands(char prompt, union acpi_parse_object *op);
+
+char *acpi_db_get_next_token(char *string,
+                             char **next, acpi_object_type * return_type);
+
 /*
  * dbstats - Generation and display of ACPI table statistics
  */
diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h
index 5935ba6707e2..ed33ebcdaebe 100644
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.h
@@ -309,10 +309,13 @@ 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
-                                                  *thread);
+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
 acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index c0a43b38c6a3..e975c6720448 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -84,9 +84,11 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info);
 
 acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info);
 
-acpi_status acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);
+acpi_status
+acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);
 
-acpi_status acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);
+acpi_status
+acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info);
 
 struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
                                                        u32 gpe_number);
diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index ce79100fb5eb..64472e4ec329 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -70,7 +70,7 @@
 
 /*
  * Enable "slack" in the AML interpreter?  Default is FALSE, and the
- * interpreter strictly follows the ACPI specification.  Setting to TRUE
+ * interpreter strictly follows the ACPI specification. Setting to TRUE
  * allows the interpreter to ignore certain errors and/or bad AML constructs.
  *
  * Currently, these features are enabled by this flag:
@@ -155,26 +155,6 @@ ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_no_resource_disassembly, FALSE);
 
 /*****************************************************************************
  *
- * Debug support
- *
- ****************************************************************************/
-
-/* Procedure nesting level for debug output */
-
-extern u32 acpi_gbl_nesting_level;
-
-ACPI_EXTERN u32 acpi_gpe_count;
-ACPI_EXTERN u32 acpi_fixed_event_count[ACPI_NUM_FIXED_EVENTS];
-
-/* Support for dynamic control method tracing mechanism */
-
-ACPI_EXTERN u32 acpi_gbl_original_dbg_level;
-ACPI_EXTERN u32 acpi_gbl_original_dbg_layer;
-ACPI_EXTERN u32 acpi_gbl_trace_dbg_level;
-ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer;
-
-/*****************************************************************************
- *
  * ACPI Table globals
  *
  ****************************************************************************/
@@ -259,15 +239,6 @@ ACPI_EXTERN acpi_spinlock acpi_gbl_hardware_lock;	/* For ACPI H/W except GPE reg
  *
  ****************************************************************************/
 
-#ifdef ACPI_DBG_TRACK_ALLOCATIONS
-
-/* Lists for tracking memory allocations */
-
-ACPI_EXTERN struct acpi_memory_list *acpi_gbl_global_list;
-ACPI_EXTERN struct acpi_memory_list *acpi_gbl_ns_node_list;
-ACPI_EXTERN u8 acpi_gbl_display_final_mem_stats;
-#endif
-
 /* Object caches */
 
 ACPI_EXTERN acpi_cache_t *acpi_gbl_namespace_cache;
@@ -326,6 +297,15 @@ extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
 
 #endif
 
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+
+/* Lists for tracking memory allocations */
+
+ACPI_EXTERN struct acpi_memory_list *acpi_gbl_global_list;
+ACPI_EXTERN struct acpi_memory_list *acpi_gbl_ns_node_list;
+ACPI_EXTERN u8 acpi_gbl_display_final_mem_stats;
+#endif
+
 /*****************************************************************************
  *
  * Namespace globals
@@ -396,13 +376,35 @@ ACPI_EXTERN struct acpi_gpe_block_info
 #if (!ACPI_REDUCED_HARDWARE)
 
 ACPI_EXTERN u8 acpi_gbl_all_gpes_initialized;
-ACPI_EXTERN ACPI_GBL_EVENT_HANDLER acpi_gbl_global_event_handler;
+ACPI_EXTERN acpi_gbl_event_handler acpi_gbl_global_event_handler;
 ACPI_EXTERN void *acpi_gbl_global_event_handler_context;
 
 #endif                          /* !ACPI_REDUCED_HARDWARE */
 
 /*****************************************************************************
  *
+ * Debug support
+ *
+ ****************************************************************************/
+
+/* Procedure nesting level for debug output */
+
+extern u32 acpi_gbl_nesting_level;
+
+/* Event counters */
+
+ACPI_EXTERN u32 acpi_gpe_count;
+ACPI_EXTERN u32 acpi_fixed_event_count[ACPI_NUM_FIXED_EVENTS];
+
+/* Support for dynamic control method tracing mechanism */
+
+ACPI_EXTERN u32 acpi_gbl_original_dbg_level;
+ACPI_EXTERN u32 acpi_gbl_original_dbg_layer;
+ACPI_EXTERN u32 acpi_gbl_trace_dbg_level;
+ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer;
+
+/*****************************************************************************
+ *
  * Debugger globals
  *
  ****************************************************************************/
@@ -426,10 +428,11 @@ ACPI_EXTERN u8 acpi_gbl_db_opt_stats;
 ACPI_EXTERN u8 acpi_gbl_db_opt_ini_methods;
 
 ACPI_EXTERN char *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS];
-ACPI_EXTERN char acpi_gbl_db_line_buf[80];
-ACPI_EXTERN char acpi_gbl_db_parsed_buf[80];
-ACPI_EXTERN char acpi_gbl_db_scope_buf[40];
-ACPI_EXTERN char acpi_gbl_db_debug_filename[40];
+ACPI_EXTERN acpi_object_type acpi_gbl_db_arg_types[ACPI_DEBUGGER_MAX_ARGS];
+ACPI_EXTERN char acpi_gbl_db_line_buf[ACPI_DB_LINE_BUFFER_SIZE];
+ACPI_EXTERN char acpi_gbl_db_parsed_buf[ACPI_DB_LINE_BUFFER_SIZE];
+ACPI_EXTERN char acpi_gbl_db_scope_buf[80];
+ACPI_EXTERN char acpi_gbl_db_debug_filename[80];
 ACPI_EXTERN u8 acpi_gbl_db_output_to_file;
 ACPI_EXTERN char *acpi_gbl_db_buffer;
 ACPI_EXTERN char *acpi_gbl_db_filename;
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index c816ee675094..ff8bd0061e8b 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -262,10 +262,10 @@ struct acpi_create_field_info {
 };
 
 typedef
-acpi_status(*ACPI_INTERNAL_METHOD) (struct acpi_walk_state * walk_state);
+acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state);
 
 /*
- * Bitmapped ACPI types.  Used internally only
+ * Bitmapped ACPI types. Used internally only
  */
 #define ACPI_BTYPE_ANY                  0x00000000
 #define ACPI_BTYPE_INTEGER              0x00000001
@@ -486,8 +486,10 @@ struct acpi_gpe_device_info {
         struct acpi_namespace_node *gpe_device;
 };
 
-typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *gpe_xrupt_info,
-                struct acpi_gpe_block_info *gpe_block, void *context);
+typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *
+                                         gpe_xrupt_info,
+                                         struct acpi_gpe_block_info *gpe_block,
+                                         void *context);
 
 /* Information about each particular fixed event */
 
@@ -582,7 +584,7 @@ struct acpi_pscope_state {
 };
 
 /*
- * Thread state - one per thread across multiple walk states.  Multiple walk
+ * Thread state - one per thread across multiple walk states. Multiple walk
  * states are created when there are nested control methods executing.
  */
 struct acpi_thread_state {
@@ -645,7 +647,7 @@ union acpi_generic_state {
  *
  ****************************************************************************/
 
-typedef acpi_status(*ACPI_EXECUTE_OP) (struct acpi_walk_state * walk_state);
+typedef acpi_status(*acpi_execute_op) (struct acpi_walk_state * walk_state);
 
 /* Address Range info block */
 
@@ -1031,6 +1033,7 @@ struct acpi_db_method_info {
         acpi_handle method;
         acpi_handle main_thread_gate;
         acpi_handle thread_complete_gate;
+        acpi_handle info_gate;
         acpi_thread_id *threads;
         u32 num_threads;
         u32 num_created;
@@ -1041,6 +1044,7 @@ struct acpi_db_method_info {
         u32 num_loops;
         char pathname[128];
         char **args;
+        acpi_object_type *types;
 
         /*
          * Arguments to be passed to method for the command
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index a7f68c47f517..5efad99f2169 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -84,29 +84,29 @@
 
 /* These macros reverse the bytes during the move, converting little-endian to big endian */
 
-                          /* Big Endian      <==        Little Endian */
-                          /*  Hi...Lo                     Lo...Hi     */
+         /* Big Endian      <==        Little Endian */
+         /*  Hi...Lo                     Lo...Hi     */
 /* 16-bit source, 16/32/64 destination */
 
 #define ACPI_MOVE_16_TO_16(d, s)        {((  u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[1];\
-                                           ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[0];}
+                          ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[0];}
 
 #define ACPI_MOVE_16_TO_32(d, s)        {(*(u32 *)(void *)(d))=0;\
-                                                           ((u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
-                                                           ((u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
+                                          ((u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
+                                          ((u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
 
 #define ACPI_MOVE_16_TO_64(d, s)        {(*(u64 *)(void *)(d))=0;\
-                                                                         ((u8 *)(void *)(d))[6] = ((u8 *)(void *)(s))[1];\
-                                                                         ((u8 *)(void *)(d))[7] = ((u8 *)(void *)(s))[0];}
+                                                           ((u8 *)(void *)(d))[6] = ((u8 *)(void *)(s))[1];\
+                                                           ((u8 *)(void *)(d))[7] = ((u8 *)(void *)(s))[0];}
 
 /* 32-bit source, 16/32/64 destination */
 
 #define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)        /* Truncate to 16 */
 
 #define ACPI_MOVE_32_TO_32(d, s)        {((  u8 *)(void *)(d))[0] = ((u8 *)(void *)(s))[3];\
-                                                                                 ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[2];\
-                                                                                 ((  u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
-                                                                                 ((  u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
+                                                                          ((  u8 *)(void *)(d))[1] = ((u8 *)(void *)(s))[2];\
+                                                                          ((  u8 *)(void *)(d))[2] = ((u8 *)(void *)(s))[1];\
+                                                                          ((  u8 *)(void *)(d))[3] = ((u8 *)(void *)(s))[0];}
 
 #define ACPI_MOVE_32_TO_64(d, s)        {(*(u64 *)(void *)(d))=0;\
                                                                                    ((u8 *)(void *)(d))[4] = ((u8 *)(void *)(s))[3];\
@@ -196,24 +196,12 @@
 #endif
 #endif
 
-/* Macros based on machine integer width */
-
-#if ACPI_MACHINE_WIDTH == 32
-#define ACPI_MOVE_SIZE_TO_16(d, s)       ACPI_MOVE_32_TO_16(d, s)
-
-#elif ACPI_MACHINE_WIDTH == 64
-#define ACPI_MOVE_SIZE_TO_16(d, s)       ACPI_MOVE_64_TO_16(d, s)
-
-#else
-#error unknown ACPI_MACHINE_WIDTH
-#endif
-
 /*
  * Fast power-of-two math macros for non-optimized compilers
  */
-#define _ACPI_DIV(value, power_of2)      ((u32) ((value) >> (power_of2)))
-#define _ACPI_MUL(value, power_of2)      ((u32) ((value) << (power_of2)))
-#define _ACPI_MOD(value, divisor)        ((u32) ((value) & ((divisor) -1)))
+#define _ACPI_DIV(value, power_of2)     ((u32) ((value) >> (power_of2)))
+#define _ACPI_MUL(value, power_of2)     ((u32) ((value) << (power_of2)))
+#define _ACPI_MOD(value, divisor)       ((u32) ((value) & ((divisor) -1)))
 
 #define ACPI_DIV_2(a)                   _ACPI_DIV(a, 1)
 #define ACPI_MUL_2(a)                   _ACPI_MUL(a, 1)
@@ -238,12 +226,12 @@
 /*
  * Rounding macros (Power of two boundaries only)
  */
-#define ACPI_ROUND_DOWN(value, boundary)     (((acpi_size)(value)) & \
-                                                (~(((acpi_size) boundary)-1)))
+#define ACPI_ROUND_DOWN(value, boundary)    (((acpi_size)(value)) & \
+                                                                                                (~(((acpi_size) boundary)-1)))
 
-#define ACPI_ROUND_UP(value, boundary)       ((((acpi_size)(value)) + \
-                                                (((acpi_size) boundary)-1)) & \
-                                                (~(((acpi_size) boundary)-1)))
+#define ACPI_ROUND_UP(value, boundary)      ((((acpi_size)(value)) + \
+                                                                                                (((acpi_size) boundary)-1)) & \
+                                                                                                (~(((acpi_size) boundary)-1)))
 
 /* Note: sizeof(acpi_size) evaluates to either 4 or 8 (32- vs 64-bit mode) */
 
@@ -264,7 +252,7 @@
 
 #define ACPI_ROUND_UP_TO(value, boundary)   (((value) + ((boundary)-1)) / (boundary))
 
-#define ACPI_IS_MISALIGNED(value)           (((acpi_size) value) & (sizeof(acpi_size)-1))
+#define ACPI_IS_MISALIGNED(value)           (((acpi_size) value) & (sizeof(acpi_size)-1))
 
 /*
  * Bitmask creation
@@ -355,7 +343,6 @@
  * Ascii error messages can be configured out
  */
 #ifndef ACPI_NO_ERROR_MESSAGES
-
 /*
  * Error reporting. Callers module and line number are inserted by AE_INFO,
  * the plist contains a set of parens to allow variable-length lists.
@@ -375,18 +362,15 @@
 #define ACPI_WARN_PREDEFINED(plist)
 #define ACPI_INFO_PREDEFINED(plist)
 
-#endif          /* ACPI_NO_ERROR_MESSAGES */
+#endif                          /* ACPI_NO_ERROR_MESSAGES */
 
 /*
  * Debug macros that are conditionally compiled
  */
 #ifdef ACPI_DEBUG_OUTPUT
-
 /*
  * Function entry tracing
  */
-#ifdef CONFIG_ACPI_DEBUG_FUNC_TRACE
-
 #define ACPI_FUNCTION_TRACE(a)          ACPI_FUNCTION_NAME(a) \
                           acpi_ut_trace(ACPI_DEBUG_PARAMETERS)
 #define ACPI_FUNCTION_TRACE_PTR(a, b)   ACPI_FUNCTION_NAME(a) \
@@ -464,45 +448,19 @@
 
 #endif                          /* ACPI_SIMPLE_RETURN_MACROS */
 
-#else /* !CONFIG_ACPI_DEBUG_FUNC_TRACE */
-
-#define ACPI_FUNCTION_TRACE(a)
-#define ACPI_FUNCTION_TRACE_PTR(a,b)
-#define ACPI_FUNCTION_TRACE_U32(a,b)
-#define ACPI_FUNCTION_TRACE_STR(a,b)
-#define ACPI_FUNCTION_EXIT
-#define ACPI_FUNCTION_STATUS_EXIT(s)
-#define ACPI_FUNCTION_VALUE_EXIT(s)
-#define ACPI_FUNCTION_TRACE(a)
-#define ACPI_FUNCTION_ENTRY()
-
-#define return_VOID                     return
-#define return_ACPI_STATUS(s)           return(s)
-#define return_VALUE(s)                 return(s)
-#define return_UINT8(s)                 return(s)
-#define return_UINT32(s)                return(s)
-#define return_PTR(s)                   return(s)
-
-#endif /* CONFIG_ACPI_DEBUG_FUNC_TRACE */
-
 /* Conditional execution */
 
 #define ACPI_DEBUG_EXEC(a)              a
-#define ACPI_NORMAL_EXEC(a)
-
-#define ACPI_DEBUG_DEFINE(a)            a;
 #define ACPI_DEBUG_ONLY_MEMBERS(a)      a;
 #define _VERBOSE_STRUCTURES
 
-/* Stack and buffer dumping */
+/* Various object display routines for debug */
 
 #define ACPI_DUMP_STACK_ENTRY(a)        acpi_ex_dump_operand((a), 0)
-#define ACPI_DUMP_OPERANDS(a, b, c)     acpi_ex_dump_operands(a, b, c)
-
+#define ACPI_DUMP_OPERANDS(a, b ,c)     acpi_ex_dump_operands(a, b, c)
 #define ACPI_DUMP_ENTRY(a, b)           acpi_ns_dump_entry (a, b)
 #define ACPI_DUMP_PATHNAME(a, b, c, d)  acpi_ns_dump_pathname(a, b, c, d)
-#define ACPI_DUMP_RESOURCE_LIST(a)      acpi_rs_dump_resource_list(a)
-#define ACPI_DUMP_BUFFER(a, b)          acpi_ut_dump_buffer((u8 *) a, b, DB_BYTE_DISPLAY, _COMPONENT)
+#define ACPI_DUMP_BUFFER(a, b)          acpi_ut_debug_dump_buffer((u8 *) a, b, DB_BYTE_DISPLAY, _COMPONENT)
 
 #else
 /*
@@ -510,25 +468,23 @@
  * leaving no executable debug code!
  */
 #define ACPI_DEBUG_EXEC(a)
-#define ACPI_NORMAL_EXEC(a)             a;
-
-#define ACPI_DEBUG_DEFINE(a)            do { } while(0)
-#define ACPI_DEBUG_ONLY_MEMBERS(a)      do { } while(0)
-#define ACPI_FUNCTION_TRACE(a)          do { } while(0)
-#define ACPI_FUNCTION_TRACE_PTR(a, b)   do { } while(0)
-#define ACPI_FUNCTION_TRACE_U32(a, b)   do { } while(0)
-#define ACPI_FUNCTION_TRACE_STR(a, b)   do { } while(0)
-#define ACPI_FUNCTION_EXIT              do { } while(0)
-#define ACPI_FUNCTION_STATUS_EXIT(s)    do { } while(0)
-#define ACPI_FUNCTION_VALUE_EXIT(s)     do { } while(0)
-#define ACPI_FUNCTION_ENTRY()           do { } while(0)
-#define ACPI_DUMP_STACK_ENTRY(a)        do { } while(0)
-#define ACPI_DUMP_OPERANDS(a, b, c)     do { } while(0)
-#define ACPI_DUMP_ENTRY(a, b)           do { } while(0)
-#define ACPI_DUMP_TABLES(a, b)          do { } while(0)
-#define ACPI_DUMP_PATHNAME(a, b, c, d)  do { } while(0)
-#define ACPI_DUMP_RESOURCE_LIST(a)      do { } while(0)
-#define ACPI_DUMP_BUFFER(a, b)          do { } while(0)
+#define ACPI_DEBUG_ONLY_MEMBERS(a)
+#define ACPI_FUNCTION_TRACE(a)
+#define ACPI_FUNCTION_TRACE_PTR(a, b)
+#define ACPI_FUNCTION_TRACE_U32(a, b)
+#define ACPI_FUNCTION_TRACE_STR(a, b)
+#define ACPI_FUNCTION_EXIT
+#define ACPI_FUNCTION_STATUS_EXIT(s)
+#define ACPI_FUNCTION_VALUE_EXIT(s)
+#define ACPI_FUNCTION_ENTRY()
+#define ACPI_DUMP_STACK_ENTRY(a)
+#define ACPI_DUMP_OPERANDS(a, b, c)
+#define ACPI_DUMP_ENTRY(a, b)
+#define ACPI_DUMP_TABLES(a, b)
+#define ACPI_DUMP_PATHNAME(a, b, c, d)
+#define ACPI_DUMP_BUFFER(a, b)
+#define ACPI_DEBUG_PRINT(pl)
+#define ACPI_DEBUG_PRINT_RAW(pl)
 
 #define return_VOID                     return
 #define return_ACPI_STATUS(s)           return(s)
@@ -556,18 +512,6 @@
 #define ACPI_DEBUGGER_EXEC(a)
 #endif
 
-#ifdef ACPI_DEBUG_OUTPUT
-/*
- * 1) Set name to blanks
- * 2) Copy the object name
- */
-#define ACPI_ADD_OBJECT_NAME(a,b)       ACPI_MEMSET (a->common.name, ' ', sizeof (a->common.name));\
-                                                                                ACPI_STRNCPY (a->common.name, acpi_gbl_ns_type_names[b], sizeof (a->common.name))
-#else
-
-#define ACPI_ADD_OBJECT_NAME(a,b)
-#endif
-
 /*
  * Memory allocation tracking (DEBUG ONLY)
  */
@@ -578,13 +522,13 @@
 /* Memory allocation */
 
 #ifndef ACPI_ALLOCATE
-#define ACPI_ALLOCATE(a)            acpi_ut_allocate((acpi_size)(a), ACPI_MEM_PARAMETERS)
+#define ACPI_ALLOCATE(a)            acpi_ut_allocate((acpi_size) (a), ACPI_MEM_PARAMETERS)
 #endif
 #ifndef ACPI_ALLOCATE_ZEROED
-#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed((acpi_size)(a), ACPI_MEM_PARAMETERS)
+#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed((acpi_size) (a), ACPI_MEM_PARAMETERS)
 #endif
 #ifndef ACPI_FREE
-#define ACPI_FREE(a)                acpio_os_free(a)
+#define ACPI_FREE(a)                acpi_os_free(a)
 #endif
 #define ACPI_MEM_TRACKING(a)
 
@@ -592,16 +536,25 @@
 
 /* Memory allocation */
 
-#define ACPI_ALLOCATE(a)            acpi_ut_allocate_and_track((acpi_size)(a), ACPI_MEM_PARAMETERS)
-#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed_and_track((acpi_size)(a), ACPI_MEM_PARAMETERS)
+#define ACPI_ALLOCATE(a)            acpi_ut_allocate_and_track((acpi_size) (a), ACPI_MEM_PARAMETERS)
+#define ACPI_ALLOCATE_ZEROED(a)     acpi_ut_allocate_zeroed_and_track((acpi_size) (a), ACPI_MEM_PARAMETERS)
 #define ACPI_FREE(a)                acpi_ut_free_and_track(a, ACPI_MEM_PARAMETERS)
 #define ACPI_MEM_TRACKING(a)        a
 
 #endif                          /* ACPI_DBG_TRACK_ALLOCATIONS */
 
-/* Preemption point */
-#ifndef ACPI_PREEMPTION_POINT
-#define ACPI_PREEMPTION_POINT() /* no preemption */
-#endif
+/*
+ * Macros used for ACPICA utilities only
+ */
+
+/* Generate a UUID */
+
+#define ACPI_INIT_UUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
+        (a) & 0xFF, ((a) >> 8) & 0xFF, ((a) >> 16) & 0xFF, ((a) >> 24) & 0xFF, \
+        (b) & 0xFF, ((b) >> 8) & 0xFF, \
+        (c) & 0xFF, ((c) >> 8) & 0xFF, \
+        (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7)
+
+#define ACPI_IS_OCTAL_DIGIT(d)              (((char)(d) >= '0') && ((char)(d) <= '7'))
 
 #endif                          /* ACMACROS_H */
diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index 364a1303fb8f..24eb9eac9514 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Name: acobject.h - Definition of union acpi_operand_object  (Internal object only)
@@ -179,7 +178,7 @@ struct acpi_object_method {
         union acpi_operand_object *mutex;
         u8 *aml_start;
         union {
-                ACPI_INTERNAL_METHOD implementation;
+                acpi_internal_method implementation;
                 union acpi_operand_object *handler;
         } dispatch;
 
@@ -198,7 +197,7 @@ struct acpi_object_method {
 
 /******************************************************************************
  *
- * Objects that can be notified.  All share a common notify_info area.
+ * Objects that can be notified. All share a common notify_info area.
  *
  *****************************************************************************/
 
@@ -235,7 +234,7 @@ ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_NOTIFY_INFO};
 
 /******************************************************************************
  *
- * Fields.  All share a common header/info field.
+ * Fields. All share a common header/info field.
  *
  *****************************************************************************/
 
diff --git a/drivers/acpi/acpica/acopcode.h b/drivers/acpi/acpica/acopcode.h
index 9440d053fbb3..d786a5128b78 100644
--- a/drivers/acpi/acpica/acopcode.h
+++ b/drivers/acpi/acpica/acopcode.h
@@ -54,7 +54,7 @@
 #define _UNK                        0x6B
 
 /*
- * Reserved ASCII characters.  Do not use any of these for
+ * Reserved ASCII characters. Do not use any of these for
  * internal opcodes, since they are used to differentiate
  * name strings from AML opcodes
  */
@@ -63,7 +63,7 @@
 #define _PFX                        0x6D
 
 /*
- * All AML opcodes and the parse-time arguments for each.  Used by the AML
+ * All AML opcodes and the parse-time arguments for each. Used by the AML
  * parser  Each list is compressed into a 32-bit number and stored in the
  * master opcode table (in psopcode.c).
  */
@@ -193,7 +193,7 @@
 #define ARGP_ZERO_OP                    ARG_NONE
 
 /*
- * All AML opcodes and the runtime arguments for each.  Used by the AML
+ * All AML opcodes and the runtime arguments for each. Used by the AML
  * interpreter  Each list is compressed into a 32-bit number and stored
  * in the master opcode table (in psopcode.c).
  *
diff --git a/drivers/acpi/acpica/acparser.h b/drivers/acpi/acpica/acparser.h
index b725d780d34d..eefcf47a61a0 100644
--- a/drivers/acpi/acpica/acparser.h
+++ b/drivers/acpi/acpica/acparser.h
@@ -150,8 +150,7 @@ u8 acpi_ps_has_completed_scope(struct acpi_parse_state *parser_state);
 
 void
 acpi_ps_pop_scope(struct acpi_parse_state *parser_state,
-                  union acpi_parse_object **op,
-                  u32 * arg_list, u32 * arg_count);
+                  union acpi_parse_object **op, u32 *arg_list, u32 *arg_count);
 
 acpi_status
 acpi_ps_push_scope(struct acpi_parse_state *parser_state,
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index 3080c017f5ba..9dfa1c83bd4e 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -150,8 +150,7 @@ enum acpi_return_package_types {
  * is saved here (rather than in a separate table) in order to minimize the
  * overall size of the stored data.
  */
-static const union acpi_predefined_info predefined_names[] =
-{
+static const union acpi_predefined_info predefined_names[] = {
         {{"_AC0", 0, ACPI_RTYPE_INTEGER}},
         {{"_AC1", 0, ACPI_RTYPE_INTEGER}},
         {{"_AC2", 0, ACPI_RTYPE_INTEGER}},
@@ -538,7 +537,8 @@ static const union acpi_predefined_info predefined_names[] =
 
         /* Acpi 1.0 defined _WAK with no return value. Later, it was changed to return a package */
 
-        {{"_WAK", 1, ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}},
+        {{"_WAK", 1,
+          ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}},
                           {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2,0}, 0,0}}, /* Fixed-length (2 Int), but is optional */
 
         /* _WDG/_WED are MS extensions defined by "Windows Instrumentation" */
@@ -551,11 +551,12 @@ static const union acpi_predefined_info predefined_names[] =
 };
 
 #if 0
+
         /* This is an internally implemented control method, no need to check */
-        {{"_OSI", 1, ACPI_RTYPE_INTEGER}},
+{ {
+"_OSI", 1, ACPI_RTYPE_INTEGER}},
 
         /* TBD: */
-
         _PRT - currently ignore reversed entries. attempt to fix here?
         think about possibly fixing package elements like _BIF, etc.
 #endif
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index f196e2c9a71f..937e66c65d1e 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -53,7 +53,7 @@
  ****************************************************************************/
 
 /*
- * Walk state - current state of a parse tree walk.  Used for both a leisurely
+ * Walk state - current state of a parse tree walk. Used for both a leisurely
  * stroll through the tree (for whatever reason), and for control method
  * execution.
  */
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h
index 5035327ebccc..b0f5f92b674a 100644
--- a/drivers/acpi/acpica/acutils.h
+++ b/drivers/acpi/acpica/acutils.h
@@ -69,6 +69,22 @@ extern const char *acpi_gbl_siz_decode[];
 extern const char *acpi_gbl_trs_decode[];
 extern const char *acpi_gbl_ttp_decode[];
 extern const char *acpi_gbl_typ_decode[];
+extern const char *acpi_gbl_ppc_decode[];
+extern const char *acpi_gbl_ior_decode[];
+extern const char *acpi_gbl_dts_decode[];
+extern const char *acpi_gbl_ct_decode[];
+extern const char *acpi_gbl_sbt_decode[];
+extern const char *acpi_gbl_am_decode[];
+extern const char *acpi_gbl_sm_decode[];
+extern const char *acpi_gbl_wm_decode[];
+extern const char *acpi_gbl_cph_decode[];
+extern const char *acpi_gbl_cpo_decode[];
+extern const char *acpi_gbl_dp_decode[];
+extern const char *acpi_gbl_ed_decode[];
+extern const char *acpi_gbl_bpb_decode[];
+extern const char *acpi_gbl_sb_decode[];
+extern const char *acpi_gbl_fc_decode[];
+extern const char *acpi_gbl_pt_decode[];
 #endif
 
 /* Types for Resource descriptor entries */
@@ -79,14 +95,14 @@ extern const char *acpi_gbl_typ_decode[];
 #define ACPI_SMALL_VARIABLE_LENGTH      3
 
 typedef
-acpi_status(*acpi_walk_aml_callback) (u8 * aml,
+acpi_status(*acpi_walk_aml_callback) (u8 *aml,
                                       u32 length,
                                       u32 offset,
                                       u8 resource_index, void **context);
 
 typedef
 acpi_status(*acpi_pkg_callback) (u8 object_type,
-                                 union acpi_operand_object * source_object,
+                                 union acpi_operand_object *source_object,
                                  union acpi_generic_state * state,
                                  void *context);
 
@@ -202,7 +218,9 @@ extern const u8 _acpi_ctype[];
 #define ACPI_IS_PRINT(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP | _ACPI_DI | _ACPI_SP | _ACPI_PU))
 #define ACPI_IS_ALPHA(c)  (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP))
 
-#endif                          /* ACPI_USE_SYSTEM_CLIBRARY */
+#endif                          /* !ACPI_USE_SYSTEM_CLIBRARY */
+
+#define ACPI_IS_ASCII(c)  ((c) < 0x80)
 
 /*
  * utcopy - Object construction and conversion interfaces
@@ -210,11 +228,11 @@ extern const u8 _acpi_ctype[];
 acpi_status
 acpi_ut_build_simple_object(union acpi_operand_object *obj,
                             union acpi_object *user_obj,
-                            u8 * data_space, u32 * buffer_space_used);
+                            u8 *data_space, u32 *buffer_space_used);
 
 acpi_status
 acpi_ut_build_package_object(union acpi_operand_object *obj,
-                             u8 * buffer, u32 * space_used);
+                             u8 *buffer, u32 *space_used);
 
 acpi_status
 acpi_ut_copy_iobject_to_eobject(union acpi_operand_object *obj,
@@ -287,9 +305,10 @@ acpi_ut_ptr_exit(u32 line_number,
                  const char *function_name,
                  const char *module_name, u32 component_id, u8 *ptr);
 
-void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id);
+void
+acpi_ut_debug_dump_buffer(u8 *buffer, u32 count, u32 display, u32 component_id);
 
-void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display);
+void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 offset);
 
 void acpi_ut_report_error(char *module_name, u32 line_number);
 
@@ -337,15 +356,19 @@ acpi_ut_execute_power_methods(struct acpi_namespace_node *device_node,
  */
 acpi_status
 acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
-                    struct acpica_device_id **return_id);
+                    struct acpi_pnp_device_id ** return_id);
 
 acpi_status
 acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
-                    struct acpica_device_id **return_id);
+                    struct acpi_pnp_device_id ** return_id);
+
+acpi_status
+acpi_ut_execute_SUB(struct acpi_namespace_node *device_node,
+                    struct acpi_pnp_device_id **return_id);
 
 acpi_status
 acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
-                    struct acpica_device_id_list **return_cid_list);
+                    struct acpi_pnp_device_id_list ** return_cid_list);
 
 /*
  * utlock - reader/writer locks
@@ -479,15 +502,19 @@ acpi_ut_walk_package_tree(union acpi_operand_object *source_object,
 
 void acpi_ut_strupr(char *src_string);
 
+void acpi_ut_strlwr(char *src_string);
+
+int acpi_ut_stricmp(char *string1, char *string2);
+
 void acpi_ut_print_string(char *string, u8 max_length);
 
 u8 acpi_ut_valid_acpi_name(u32 name);
 
-acpi_name acpi_ut_repair_name(char *name);
+void acpi_ut_repair_name(char *name);
 
 u8 acpi_ut_valid_acpi_char(char character, u32 position);
 
-acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer);
+acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer);
 
 /* Values for Base above (16=Hex, 10=Decimal) */
 
@@ -508,12 +535,12 @@ acpi_ut_display_init_pathname(u8 type,
  * utresrc
  */
 acpi_status
-acpi_ut_walk_aml_resources(u8 * aml,
+acpi_ut_walk_aml_resources(u8 *aml,
                            acpi_size aml_length,
                            acpi_walk_aml_callback user_function,
                            void **context);
 
-acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index);
+acpi_status acpi_ut_validate_resource(void *aml, u8 *return_index);
 
 u32 acpi_ut_get_descriptor_length(void *aml);
 
@@ -524,8 +551,7 @@ u8 acpi_ut_get_resource_header_length(void *aml);
 u8 acpi_ut_get_resource_type(void *aml);
 
 acpi_status
-acpi_ut_get_resource_end_tag(union acpi_operand_object *obj_desc,
-                             u8 ** end_tag);
+acpi_ut_get_resource_end_tag(union acpi_operand_object *obj_desc, u8 **end_tag);
 
 /*
  * utmutex - mutex support
diff --git a/drivers/acpi/acpica/amlresrc.h b/drivers/acpi/acpica/amlresrc.h
index af4947956ec2..968449685e06 100644
--- a/drivers/acpi/acpica/amlresrc.h
+++ b/drivers/acpi/acpica/amlresrc.h
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: amlresrc.h - AML resource descriptors
diff --git a/drivers/acpi/acpica/dscontrol.c b/drivers/acpi/acpica/dscontrol.c
index 465f02134b89..57895db3231a 100644
--- a/drivers/acpi/acpica/dscontrol.c
+++ b/drivers/acpi/acpica/dscontrol.c
@@ -280,7 +280,7 @@ acpi_ds_exec_end_control_op(struct acpi_walk_state * walk_state,
 
                         /*
                          * Get the return value and save as the last result
-                         * value.  This is the only place where walk_state->return_desc
+                         * value. This is the only place where walk_state->return_desc
                          * is set to anything other than zero!
                          */
                         walk_state->return_desc = walk_state->operands[0];
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index 3da6fd8530c5..b5b904ee815f 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -277,7 +277,7 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Process all named fields in a field declaration.  Names are
+ * DESCRIPTION: Process all named fields in a field declaration. Names are
  *              entered into the namespace.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c
index aa9a5d4e4052..52eb4e01622a 100644
--- a/drivers/acpi/acpica/dsmethod.c
+++ b/drivers/acpi/acpica/dsmethod.c
@@ -170,7 +170,7 @@ acpi_ds_create_method_mutex(union acpi_operand_object *method_desc)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Prepare a method for execution.  Parses the method if necessary,
+ * DESCRIPTION: Prepare a method for execution. Parses the method if necessary,
  *              increments the thread count, and waits at the method semaphore
  *              for clearance to execute.
  *
@@ -444,7 +444,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread,
  * RETURN:      Status
  *
  * DESCRIPTION: Restart a method that was preempted by another (nested) method
- *              invocation.  Handle the return value (if any) from the callee.
+ *              invocation. Handle the return value (if any) from the callee.
  *
  ******************************************************************************/
 
@@ -530,7 +530,7 @@ acpi_ds_restart_control_method(struct acpi_walk_state *walk_state,
  *
  * RETURN:      None
  *
- * DESCRIPTION: Terminate a control method.  Delete everything that the method
+ * DESCRIPTION: Terminate a control method. Delete everything that the method
  *              created, delete all locals and arguments, and delete the parse
  *              tree if requested.
  *
diff --git a/drivers/acpi/acpica/dsmthdat.c b/drivers/acpi/acpica/dsmthdat.c
index 8d55cebaa656..9a83b7e0f3ba 100644
--- a/drivers/acpi/acpica/dsmthdat.c
+++ b/drivers/acpi/acpica/dsmthdat.c
@@ -76,7 +76,7 @@ acpi_ds_method_data_get_type(u16 opcode,
  * RETURN:      Status
  *
  * DESCRIPTION: Initialize the data structures that hold the method's arguments
- *              and locals.  The data struct is an array of namespace nodes for
+ *              and locals. The data struct is an array of namespace nodes for
  *              each - this allows ref_of and de_ref_of to work properly for these
  *              special data types.
  *
@@ -129,7 +129,7 @@ void acpi_ds_method_data_init(struct acpi_walk_state *walk_state)
  *
  * RETURN:      None
  *
- * DESCRIPTION: Delete method locals and arguments.  Arguments are only
+ * DESCRIPTION: Delete method locals and arguments. Arguments are only
  *              deleted if this method was called from another method.
  *
  ******************************************************************************/
@@ -183,7 +183,7 @@ void acpi_ds_method_data_delete_all(struct acpi_walk_state *walk_state)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Initialize arguments for a method.  The parameter list is a list
+ * DESCRIPTION: Initialize arguments for a method. The parameter list is a list
  *              of ACPI operand objects, either null terminated or whose length
  *              is defined by max_param_count.
  *
@@ -401,7 +401,7 @@ acpi_ds_method_data_get_value(u8 type,
                  * This means that either 1) The expected argument was
                  * not passed to the method, or 2) A local variable
                  * was referenced by the method (via the ASL)
-                 * before it was initialized.  Either case is an error.
+                 * before it was initialized. Either case is an error.
                  */
 
                 /* If slack enabled, init the local_x/arg_x to an Integer of value zero */
@@ -465,7 +465,7 @@ acpi_ds_method_data_get_value(u8 type,
  *
  * RETURN:      None
  *
- * DESCRIPTION: Delete the entry at Opcode:Index.  Inserts
+ * DESCRIPTION: Delete the entry at Opcode:Index. Inserts
  *              a null into the stack slot after the object is deleted.
  *
  ******************************************************************************/
@@ -523,7 +523,7 @@ acpi_ds_method_data_delete_value(u8 type,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Store a value in an Arg or Local.  The obj_desc is installed
+ * DESCRIPTION: Store a value in an Arg or Local. The obj_desc is installed
  *              as the new value for the Arg or Local and the reference count
  *              for obj_desc is incremented.
  *
@@ -566,7 +566,7 @@ acpi_ds_store_object_to_local(u8 type,
 
         /*
          * If the reference count on the object is more than one, we must
-         * take a copy of the object before we store.  A reference count
+         * take a copy of the object before we store. A reference count
          * of exactly 1 means that the object was just created during the
          * evaluation of an expression, and we can safely use it since it
          * is not used anywhere else.
diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index 68592dd34960..c9f15d3a3686 100644
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -293,7 +293,7 @@ acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
 
         /*
          * Second arg is the buffer data (optional) byte_list can be either
-         * individual bytes or a string initializer.  In either case, a
+         * individual bytes or a string initializer. In either case, a
          * byte_list appears in the AML.
          */
         arg = op->common.value.arg;     /* skip first arg */
@@ -568,7 +568,7 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state,
 
         /*
          * Because of the execution pass through the non-control-method
-         * parts of the table, we can arrive here twice.  Only init
+         * parts of the table, we can arrive here twice. Only init
          * the named object node the first time through
          */
         if (acpi_ns_get_attached_object(node)) {
@@ -618,7 +618,7 @@ acpi_ds_create_node(struct acpi_walk_state *walk_state,
  * RETURN:      Status
  *
  * DESCRIPTION: Initialize a namespace object from a parser Op and its
- *              associated arguments.  The namespace object is a more compact
+ *              associated arguments. The namespace object is a more compact
  *              representation of the Op and its arguments.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/dsopcode.c b/drivers/acpi/acpica/dsopcode.c
index aa34d8984d34..0df024e5fb63 100644
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
@@ -649,7 +649,8 @@ 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;
                 }
         }
diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index 73a5447475f5..afeb99f49482 100644
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -61,7 +61,7 @@ ACPI_MODULE_NAME("dsutils")
  *
  * RETURN:      None.
  *
- * DESCRIPTION: Clear and remove a reference on an implicit return value.  Used
+ * DESCRIPTION: Clear and remove a reference on an implicit return value. Used
  *              to delete "stale" return values (if enabled, the return value
  *              from every operator is saved at least momentarily, in case the
  *              parent method exits.)
@@ -107,7 +107,7 @@ void acpi_ds_clear_implicit_return(struct acpi_walk_state *walk_state)
  *
  * DESCRIPTION: Implements the optional "implicit return".  We save the result
  *              of every ASL operator and control method invocation in case the
- *              parent method exit.  Before storing a new return value, we
+ *              parent method exit. Before storing a new return value, we
  *              delete the previous return value.
  *
  ******************************************************************************/
@@ -198,7 +198,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
          *
          * If there is no parent, or the parent is a scope_op, we are executing
          * at the method level. An executing method typically has no parent,
-         * since each method is parsed separately.  A method invoked externally
+         * since each method is parsed separately. A method invoked externally
          * via execute_control_method has a scope_op as the parent.
          */
         if ((!op->common.parent) ||
@@ -223,7 +223,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
         }
 
         /*
-         * Decide what to do with the result based on the parent.  If
+         * Decide what to do with the result based on the parent. If
          * the parent opcode will not use the result, delete the object.
          * Otherwise leave it as is, it will be deleted when it is used
          * as an operand later.
@@ -266,7 +266,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
 
                 /*
                  * These opcodes allow term_arg(s) as operands and therefore
-                 * the operands can be method calls.  The result is used.
+                 * the operands can be method calls. The result is used.
                  */
                 goto result_used;
 
@@ -284,7 +284,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
                         AML_BANK_FIELD_OP)) {
                         /*
                          * These opcodes allow term_arg(s) as operands and therefore
-                         * the operands can be method calls.  The result is used.
+                         * the operands can be method calls. The result is used.
                          */
                         goto result_used;
                 }
@@ -329,9 +329,9 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Used after interpretation of an opcode.  If there is an internal
+ * DESCRIPTION: Used after interpretation of an opcode. If there is an internal
  *              result descriptor, check if the parent opcode will actually use
- *              this result.  If not, delete the result now so that it will
+ *              this result. If not, delete the result now so that it will
  *              not become orphaned.
  *
  ******************************************************************************/
@@ -376,7 +376,7 @@ acpi_ds_delete_result_if_not_used(union acpi_parse_object *op,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Resolve all operands to their values.  Used to prepare
+ * DESCRIPTION: Resolve all operands to their values. Used to prepare
  *              arguments to a control method invocation (a call from one
  *              method to another.)
  *
@@ -391,7 +391,7 @@ acpi_status acpi_ds_resolve_operands(struct acpi_walk_state *walk_state)
 
         /*
          * Attempt to resolve each of the valid operands
-         * Method arguments are passed by reference, not by value.  This means
+         * Method arguments are passed by reference, not by value. This means
          * that the actual objects are passed, not copies of the objects.
          */
         for (i = 0; i < walk_state->num_operands; i++) {
@@ -451,7 +451,7 @@ void acpi_ds_clear_operands(struct acpi_walk_state *walk_state)
  * RETURN:      Status
  *
  * DESCRIPTION: Translate a parse tree object that is an argument to an AML
- *              opcode to the equivalent interpreter object.  This may include
+ *              opcode to the equivalent interpreter object. This may include
  *              looking up a name or entering a new name into the internal
  *              namespace.
  *
@@ -496,9 +496,9 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                 /*
                  * Special handling for buffer_field declarations. This is a deferred
                  * opcode that unfortunately defines the field name as the last
-                 * parameter instead of the first.  We get here when we are performing
+                 * parameter instead of the first. We get here when we are performing
                  * the deferred execution, so the actual name of the field is already
-                 * in the namespace.  We don't want to attempt to look it up again
+                 * in the namespace. We don't want to attempt to look it up again
                  * because we may be executing in a different scope than where the
                  * actual opcode exists.
                  */
@@ -560,7 +560,8 @@ 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
+                                        obj_desc =
+                                            ACPI_CAST_PTR(union
                                                                  acpi_operand_object,
                                                                  acpi_gbl_root_node);
                                         status = AE_OK;
@@ -604,8 +605,8 @@ acpi_ds_create_operand(struct acpi_walk_state *walk_state,
                         /*
                          * If the name is null, this means that this is an
                          * optional result parameter that was not specified
-                         * in the original ASL.  Create a Zero Constant for a
-                         * placeholder.  (Store to a constant is a Noop.)
+                         * in the original ASL. Create a Zero Constant for a
+                         * placeholder. (Store to a constant is a Noop.)
                          */
                         opcode = AML_ZERO_OP;   /* Has no arguments! */
 
diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c
index 642f3c053e87..58593931be96 100644
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -57,7 +57,7 @@ ACPI_MODULE_NAME("dswexec")
 /*
  * Dispatch table for opcode classes
  */
-static ACPI_EXECUTE_OP acpi_gbl_op_type_dispatch[] = {
+static acpi_execute_op acpi_gbl_op_type_dispatch[] = {
         acpi_ex_opcode_0A_0T_1R,
         acpi_ex_opcode_1A_0T_0R,
         acpi_ex_opcode_1A_0T_1R,
@@ -204,7 +204,7 @@ acpi_ds_get_predicate_value(struct acpi_walk_state *walk_state,
  * RETURN:      Status
  *
  * DESCRIPTION: Descending callback used during the execution of control
- *              methods.  This is where most operators and operands are
+ *              methods. This is where most operators and operands are
  *              dispatched to the interpreter.
  *
  ****************************************************************************/
@@ -297,7 +297,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
                 if (walk_state->walk_type & ACPI_WALK_METHOD) {
                         /*
                          * Found a named object declaration during method execution;
-                         * we must enter this object into the namespace.  The created
+                         * we must enter this object into the namespace. The created
                          * object is temporary and will be deleted upon completion of
                          * the execution of this method.
                          *
@@ -348,7 +348,7 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
  * RETURN:      Status
  *
  * DESCRIPTION: Ascending callback used during the execution of control
- *              methods.  The only thing we really need to do here is to
+ *              methods. The only thing we really need to do here is to
  *              notice the beginning of IF, ELSE, and WHILE blocks.
  *
  ****************************************************************************/
@@ -432,7 +432,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
                 if (ACPI_SUCCESS(status)) {
                         /*
                          * Dispatch the request to the appropriate interpreter handler
-                         * routine.  There is one routine per opcode "type" based upon the
+                         * routine. There is one routine per opcode "type" based upon the
                          * number of opcode arguments and return type.
                          */
                         status =
diff --git a/drivers/acpi/acpica/dswload2.c b/drivers/acpi/acpica/dswload2.c
index 89c0114210c0..379835748357 100644
--- a/drivers/acpi/acpica/dswload2.c
+++ b/drivers/acpi/acpica/dswload2.c
@@ -254,7 +254,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
                                     acpi_ut_get_type_name(node->type),
                                     acpi_ut_get_node_name(node)));
 
-                        return (AE_AML_OPERAND_TYPE);
+                        return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
                 break;
 
@@ -602,7 +602,7 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
                                                           region_space,
                                                           walk_state);
                                 if (ACPI_FAILURE(status)) {
-                                        return (status);
+                                        return_ACPI_STATUS(status);
                                 }
 
                                 acpi_ex_exit_interpreter();
diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
index d0e6555061e4..3e65a15a735f 100644
--- a/drivers/acpi/acpica/dswstate.c
+++ b/drivers/acpi/acpica/dswstate.c
@@ -51,8 +51,9 @@
 ACPI_MODULE_NAME("dswstate")
 
   /* Local prototypes */
-static acpi_status acpi_ds_result_stack_push(struct acpi_walk_state *ws);
-static acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state *ws);
+static acpi_status
+acpi_ds_result_stack_push(struct acpi_walk_state *walk_state);
+static acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state *walk_state);
 
 /*******************************************************************************
  *
@@ -347,7 +348,7 @@ acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Pop this walk's object stack.  Objects on the stack are NOT
+ * DESCRIPTION: Pop this walk's object stack. Objects on the stack are NOT
  *              deleted by this routine.
  *
  ******************************************************************************/
@@ -491,7 +492,7 @@ acpi_ds_push_walk_state(struct acpi_walk_state *walk_state,
  * RETURN:      A walk_state object popped from the thread's stack
  *
  * DESCRIPTION: Remove and return the walkstate object that is at the head of
- *              the walk stack for the given walk list.  NULL indicates that
+ *              the walk stack for the given walk list. NULL indicates that
  *              the list is empty.
  *
  ******************************************************************************/
@@ -531,14 +532,17 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)
  *
  * RETURN:      Pointer to the new walk state.
  *
- * DESCRIPTION: Allocate and initialize a new walk state.  The current walk
+ * DESCRIPTION: Allocate and initialize a new walk state. The current walk
  *              state is set to this new 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
+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;
@@ -653,7 +657,7 @@ acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,
                 /*
                  * Setup the current scope.
                  * Find a Named Op that has a namespace node associated with it.
-                 * search upwards from this Op.  Current scope is the first
+                 * search upwards from this Op. Current scope is the first
                  * Op with a namespace node.
                  */
                 extra_op = parser_state->start_op;
@@ -704,13 +708,13 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)
         ACPI_FUNCTION_TRACE_PTR(ds_delete_walk_state, walk_state);
 
         if (!walk_state) {
-                return;
+                return_VOID;
         }
 
         if (walk_state->descriptor_type != ACPI_DESC_TYPE_WALK) {
                 ACPI_ERROR((AE_INFO, "%p is not a valid walk state",
                             walk_state));
-                return;
+                return_VOID;
         }
 
         /* There should not be any open scopes */
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c
index ef0193d74b5d..36d120574423 100644
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
@@ -89,7 +89,8 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info)
         /* Set the mask bit only if there are references to this GPE */
 
         if (gpe_event_info->runtime_count) {
-                ACPI_SET_BIT(gpe_register_info->enable_for_run, (u8)register_bit);
+                ACPI_SET_BIT(gpe_register_info->enable_for_run,
+                             (u8)register_bit);
         }
 
         return_ACPI_STATUS(AE_OK);
@@ -106,8 +107,7 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info)
  * DESCRIPTION: Clear a GPE of stale events and enable it.
  *
  ******************************************************************************/
-acpi_status
-acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
+acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 {
         acpi_status status;
 
@@ -131,8 +131,8 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
         }
 
         /* Enable the requested GPE */
-        status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_ENABLE);
 
+        status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_ENABLE);
         return_ACPI_STATUS(status);
 }
 
@@ -150,7 +150,8 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)
  *
  ******************************************************************************/
 
-acpi_status acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
+acpi_status
+acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
 {
         acpi_status status = AE_OK;
 
@@ -191,7 +192,8 @@ acpi_status acpi_ev_add_gpe_reference(struct acpi_gpe_event_info *gpe_event_info
  *
  ******************************************************************************/
 
-acpi_status acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
+acpi_status
+acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_info)
 {
         acpi_status status = AE_OK;
 
@@ -208,7 +210,8 @@ acpi_status acpi_ev_remove_gpe_reference(struct acpi_gpe_event_info *gpe_event_i
 
                 status = acpi_ev_update_gpe_enable_mask(gpe_event_info);
                 if (ACPI_SUCCESS(status)) {
-                        status = acpi_hw_low_set_gpe(gpe_event_info,
+                        status =
+                            acpi_hw_low_set_gpe(gpe_event_info,
                                                      ACPI_GPE_DISABLE);
                 }
 
@@ -306,7 +309,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 *)
+        obj_desc =
+            acpi_ns_get_attached_object((struct acpi_namespace_node *)
                                                gpe_device);
         if (!obj_desc || !obj_desc->device.gpe_block) {
                 return (NULL);
diff --git a/drivers/acpi/acpica/evgpeblk.c b/drivers/acpi/acpica/evgpeblk.c
index 8cf4c104c7b7..1571a61a7833 100644
--- a/drivers/acpi/acpica/evgpeblk.c
+++ b/drivers/acpi/acpica/evgpeblk.c
@@ -486,7 +486,8 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                         if (ACPI_FAILURE(status)) {
                                 ACPI_EXCEPTION((AE_INFO, status,
                                         "Could not enable GPE 0x%02X",
-                                        gpe_index + gpe_block->block_base_number));
+                                        gpe_index +
+                                        gpe_block->block_base_number));
                                 continue;
                         }
 
diff --git a/drivers/acpi/acpica/evgpeutil.c b/drivers/acpi/acpica/evgpeutil.c
index cb50dd91bc18..228a0c3b1d49 100644
--- a/drivers/acpi/acpica/evgpeutil.c
+++ b/drivers/acpi/acpica/evgpeutil.c
@@ -374,7 +374,8 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
                                 gpe_event_info->dispatch.handler = NULL;
                                 gpe_event_info->flags &=
                                     ~ACPI_GPE_DISPATCH_MASK;
-                        } else if ((gpe_event_info->
+                        } else
+                            if ((gpe_event_info->
                                  flags & ACPI_GPE_DISPATCH_MASK) ==
                                 ACPI_GPE_DISPATCH_NOTIFY) {
 
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index 4c1c8261166f..1474241bfc7e 100644
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -227,8 +227,7 @@ 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) {
                                                 /*
@@ -350,8 +349,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
 static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)
 {
         acpi_status status;
-        struct acpica_device_id *hid;
-        struct acpica_device_id_list *cid;
+        struct acpi_pnp_device_id *hid;
+        struct acpi_pnp_device_id_list *cid;
         u32 i;
         u8 match;
 
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index 7587eb6c9584..ae668f32cf16 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -398,7 +398,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_exception_handler)
  *
  ******************************************************************************/
 acpi_status
-acpi_install_global_event_handler(ACPI_GBL_EVENT_HANDLER handler, void *context)
+acpi_install_global_event_handler(acpi_gbl_event_handler handler, void *context)
 {
         acpi_status status;
 
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
index 87c5f2332260..3f30e753b652 100644
--- a/drivers/acpi/acpica/evxfgpe.c
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -221,7 +221,8 @@ acpi_setup_gpe_for_wake(acpi_handle wake_device,
         if (wake_device == ACPI_ROOT_OBJECT) {
                 device_node = acpi_gbl_root_node;
         } else {
-                device_node = ACPI_CAST_PTR(struct acpi_namespace_node, wake_device);
+                device_node =
+                    ACPI_CAST_PTR(struct acpi_namespace_node, wake_device);
         }
 
         /* Validate WakeDevice is of type Device */
@@ -324,7 +325,8 @@ ACPI_EXPORT_SYMBOL(acpi_setup_gpe_for_wake)
  *
  ******************************************************************************/
 
-acpi_status acpi_set_gpe_wake_mask(acpi_handle gpe_device, u32 gpe_number, u8 action)
+acpi_status
+acpi_set_gpe_wake_mask(acpi_handle gpe_device, u32 gpe_number, u8 action)
 {
         acpi_status status = AE_OK;
         struct acpi_gpe_event_info *gpe_event_info;
@@ -567,7 +569,7 @@ acpi_install_gpe_block(acpi_handle gpe_device,
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
         if (ACPI_FAILURE(status)) {
-                return (status);
+                return_ACPI_STATUS(status);
         }
 
         node = acpi_ns_validate_handle(gpe_device);
@@ -650,7 +652,7 @@ acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
         if (ACPI_FAILURE(status)) {
-                return (status);
+                return_ACPI_STATUS(status);
         }
 
         node = acpi_ns_validate_handle(gpe_device);
@@ -694,8 +696,7 @@ ACPI_EXPORT_SYMBOL(acpi_remove_gpe_block)
  *              the FADT-defined gpe blocks. Otherwise, the GPE block device.
  *
  ******************************************************************************/
-acpi_status
-acpi_get_gpe_device(u32 index, acpi_handle *gpe_device)
+acpi_status acpi_get_gpe_device(u32 index, acpi_handle * gpe_device)
 {
         struct acpi_gpe_device_info info;
         acpi_status status;
diff --git a/drivers/acpi/acpica/exconvrt.c b/drivers/acpi/acpica/exconvrt.c
index bfb062e4c4b4..4492a4e03022 100644
--- a/drivers/acpi/acpica/exconvrt.c
+++ b/drivers/acpi/acpica/exconvrt.c
@@ -516,8 +516,8 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
                         string_length--;
                 }
 
-                return_desc = acpi_ut_create_string_object((acpi_size)
-                                                           string_length);
+                return_desc =
+                    acpi_ut_create_string_object((acpi_size) string_length);
                 if (!return_desc) {
                         return_ACPI_STATUS(AE_NO_MEMORY);
                 }
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index 691d4763102c..66554bc6f9a8 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -78,7 +78,7 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
             (target_node->type == ACPI_TYPE_LOCAL_METHOD_ALIAS)) {
                 /*
                  * Dereference an existing alias so that we don't create a chain
-                 * of aliases.  With this code, we guarantee that an alias is
+                 * of aliases. With this code, we guarantee that an alias is
                  * always exactly one level of indirection away from the
                  * actual aliased name.
                  */
@@ -90,7 +90,7 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
         /*
          * For objects that can never change (i.e., the NS node will
          * permanently point to the same object), we can simply attach
-         * the object to the new NS node.  For other objects (such as
+         * the object to the new NS node. For other objects (such as
          * Integers, buffers, etc.), we have to point the Alias node
          * to the original Node.
          */
@@ -139,7 +139,7 @@ acpi_status acpi_ex_create_alias(struct acpi_walk_state *walk_state)
 
                 /*
                  * The new alias assumes the type of the target, and it points
-                 * to the same object.  The reference count of the object has an
+                 * to the same object. The reference count of the object has an
                  * additional reference to prevent deletion out from under either the
                  * target node or the alias Node
                  */
@@ -243,8 +243,7 @@ acpi_status acpi_ex_create_mutex(struct acpi_walk_state *walk_state)
 
         /* Init object and attach to NS node */
 
-        obj_desc->mutex.sync_level =
-            (u8) walk_state->operands[1]->integer.value;
+        obj_desc->mutex.sync_level = (u8)walk_state->operands[1]->integer.value;
         obj_desc->mutex.node =
             (struct acpi_namespace_node *)walk_state->operands[0];
 
diff --git a/drivers/acpi/acpica/exdebug.c b/drivers/acpi/acpica/exdebug.c
index bc5b9a6a1316..d7c9f51608a7 100644
--- a/drivers/acpi/acpica/exdebug.c
+++ b/drivers/acpi/acpica/exdebug.c
@@ -145,10 +145,10 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
         case ACPI_TYPE_BUFFER:
 
                 acpi_os_printf("[0x%.2X]\n", (u32)source_desc->buffer.length);
-                acpi_ut_dump_buffer2(source_desc->buffer.pointer,
-                                     (source_desc->buffer.length < 256) ?
-                                     source_desc->buffer.length : 256,
-                                     DB_BYTE_DISPLAY);
+                acpi_ut_dump_buffer(source_desc->buffer.pointer,
+                                    (source_desc->buffer.length < 256) ?
+                                    source_desc->buffer.length : 256,
+                                    DB_BYTE_DISPLAY, 0);
                 break;
 
         case ACPI_TYPE_STRING:
@@ -190,7 +190,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
 
                         acpi_os_printf("Table Index 0x%X\n",
                                        source_desc->reference.value);
-                        return;
+                        return_VOID;
 
                 default:
                         break;
diff --git a/drivers/acpi/acpica/exdump.c b/drivers/acpi/acpica/exdump.c
index 213c081776fc..858b43a7dcf6 100644
--- a/drivers/acpi/acpica/exdump.c
+++ b/drivers/acpi/acpica/exdump.c
@@ -464,7 +464,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)
+            if (!
+                ((ACPI_LV_EXEC & acpi_dbg_level)
                   && (_COMPONENT & acpi_dbg_layer))) {
                 return;
         }
@@ -777,7 +778,7 @@ acpi_ex_dump_operands(union acpi_operand_object **operands,
  * PARAMETERS:  title               - Descriptive text
  *              value               - Value to be displayed
  *
- * DESCRIPTION: Object dump output formatting functions.  These functions
+ * DESCRIPTION: Object dump output formatting functions. These functions
  *              reduce the number of format strings required and keeps them
  *              all in one place for easy modification.
  *
@@ -810,7 +811,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)
+                if (!
+                    ((ACPI_LV_OBJECTS & acpi_dbg_level)
                       && (_COMPONENT & acpi_dbg_layer))) {
                         return;
                 }
@@ -940,10 +942,11 @@ acpi_ex_dump_package_obj(union acpi_operand_object *obj_desc,
                 acpi_os_printf("[Buffer] Length %.2X = ",
                                obj_desc->buffer.length);
                 if (obj_desc->buffer.length) {
-                        acpi_ut_dump_buffer(ACPI_CAST_PTR
-                                            (u8, obj_desc->buffer.pointer),
-                                            obj_desc->buffer.length,
-                                            DB_DWORD_DISPLAY, _COMPONENT);
+                        acpi_ut_debug_dump_buffer(ACPI_CAST_PTR
+                                                  (u8,
+                                                   obj_desc->buffer.pointer),
+                                                  obj_desc->buffer.length,
+                                                  DB_DWORD_DISPLAY, _COMPONENT);
                 } else {
                         acpi_os_printf("\n");
                 }
@@ -996,7 +999,8 @@ acpi_ex_dump_object_descriptor(union acpi_operand_object *obj_desc, u32 flags)
         }
 
         if (!flags) {
-                if (!((ACPI_LV_OBJECTS & acpi_dbg_level)
+                if (!
+                    ((ACPI_LV_OBJECTS & acpi_dbg_level)
                       && (_COMPONENT & acpi_dbg_layer))) {
                         return_VOID;
                 }
diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
index dc092f5b35d6..ebc55fbf3ff7 100644
--- a/drivers/acpi/acpica/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -59,7 +59,7 @@ ACPI_MODULE_NAME("exfield")
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Read from a named field.  Returns either an Integer or a
+ * DESCRIPTION: Read from a named field. Returns either an Integer or a
  *              Buffer, depending on the size of the field.
  *
  ******************************************************************************/
@@ -149,7 +149,7 @@ acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
          * Allocate a buffer for the contents of the field.
          *
          * If the field is larger than the current integer width, create
-         * a BUFFER to hold it.  Otherwise, use an INTEGER.  This allows
+         * a BUFFER to hold it. Otherwise, use an INTEGER. This allows
          * the use of arithmetic operators on the returned value if the
          * field size is equal or smaller than an Integer.
          *
diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c
index a7784152ed30..aa2ccfb7cb61 100644
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -54,8 +54,7 @@ ACPI_MODULE_NAME("exfldio")
 /* Local prototypes */
 static acpi_status
 acpi_ex_field_datum_io(union acpi_operand_object *obj_desc,
-                       u32 field_datum_byte_offset,
-                       u64 *value, u32 read_write);
+                       u32 field_datum_byte_offset, u64 *value, u32 read_write);
 
 static u8
 acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value);
@@ -155,7 +154,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
 #endif
 
         /*
-         * Validate the request.  The entire request from the byte offset for a
+         * Validate the request. The entire request from the byte offset for a
          * length of one field datum (access width) must fit within the region.
          * (Region length is specified in bytes)
          */
@@ -183,7 +182,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
                     obj_desc->common_field.access_byte_width) {
                         /*
                          * This is the case where the access_type (acc_word, etc.) is wider
-                         * than the region itself.  For example, a region of length one
+                         * than the region itself. For example, a region of length one
                          * byte, and a field with Dword access specified.
                          */
                         ACPI_ERROR((AE_INFO,
@@ -321,7 +320,7 @@ acpi_ex_access_region(union acpi_operand_object *obj_desc,
  *
  * DESCRIPTION: Check if a value is out of range of the field being written.
  *              Used to check if the values written to Index and Bank registers
- *              are out of range.  Normally, the value is simply truncated
+ *              are out of range. Normally, the value is simply truncated
  *              to fit the field, but this case is most likely a serious
  *              coding error in the ASL.
  *
@@ -370,7 +369,7 @@ acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Read or Write a single datum of a field.  The field_type is
+ * DESCRIPTION: Read or Write a single datum of a field. The field_type is
  *              demultiplexed here to handle the different types of fields
  *              (buffer_field, region_field, index_field, bank_field)
  *
@@ -860,7 +859,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
             ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length);
         /*
          * We must have a buffer that is at least as long as the field
-         * we are writing to.  This is because individual fields are
+         * we are writing to. This is because individual fields are
          * indivisible and partial writes are not supported -- as per
          * the ACPI specification.
          */
@@ -875,7 +874,7 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
 
                 /*
                  * Copy the original data to the new buffer, starting
-                 * at Byte zero.  All unused (upper) bytes of the
+                 * at Byte zero. All unused (upper) bytes of the
                  * buffer will be 0.
                  */
                 ACPI_MEMCPY((char *)new_buffer, (char *)buffer, buffer_length);
diff --git a/drivers/acpi/acpica/exmisc.c b/drivers/acpi/acpica/exmisc.c
index 271c0c57ea10..84058705ed12 100644
--- a/drivers/acpi/acpica/exmisc.c
+++ b/drivers/acpi/acpica/exmisc.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exmisc - ACPI AML (p-code) execution - specific opcodes
@@ -254,7 +253,7 @@ acpi_ex_do_concatenate(union acpi_operand_object *operand0,
         ACPI_FUNCTION_TRACE(ex_do_concatenate);
 
         /*
-         * Convert the second operand if necessary.  The first operand
+         * Convert the second operand if necessary. The first operand
          * determines the type of the second operand, (See the Data Types
          * section of the ACPI specification.)  Both object types are
          * guaranteed to be either Integer/String/Buffer by the operand
@@ -573,7 +572,7 @@ acpi_ex_do_logical_op(u16 opcode,
         ACPI_FUNCTION_TRACE(ex_do_logical_op);
 
         /*
-         * Convert the second operand if necessary.  The first operand
+         * Convert the second operand if necessary. The first operand
          * determines the type of the second operand, (See the Data Types
          * section of the ACPI 3.0+ specification.)  Both object types are
          * guaranteed to be either Integer/String/Buffer by the operand
diff --git a/drivers/acpi/acpica/exmutex.c b/drivers/acpi/acpica/exmutex.c
index bcceda5be9e3..d1f449d93dcf 100644
--- a/drivers/acpi/acpica/exmutex.c
+++ b/drivers/acpi/acpica/exmutex.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exmutex - ASL Mutex Acquire/Release functions
@@ -305,7 +304,7 @@ acpi_status acpi_ex_release_mutex_object(union acpi_operand_object *obj_desc)
         ACPI_FUNCTION_TRACE(ex_release_mutex_object);
 
         if (obj_desc->mutex.acquisition_depth == 0) {
-                return (AE_NOT_ACQUIRED);
+                return_ACPI_STATUS(AE_NOT_ACQUIRED);
         }
 
         /* Match multiple Acquires with multiple Releases */
@@ -462,7 +461,7 @@ void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread)
         union acpi_operand_object *next = thread->acquired_mutex_list;
         union acpi_operand_object *obj_desc;
 
-        ACPI_FUNCTION_ENTRY();
+        ACPI_FUNCTION_NAME(ex_release_all_mutexes);
 
         /* Traverse the list of owned mutexes, releasing each one */
 
@@ -474,6 +473,10 @@ void acpi_ex_release_all_mutexes(struct acpi_thread_state *thread)
                 obj_desc->mutex.next = NULL;
                 obj_desc->mutex.acquisition_depth = 0;
 
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                  "Force-releasing held mutex: %p\n",
+                                  obj_desc));
+
                 /* Release the mutex, special case for Global Lock */
 
                 if (obj_desc == acpi_gbl_global_lock_mutex) {
diff --git a/drivers/acpi/acpica/exnames.c b/drivers/acpi/acpica/exnames.c
index fcc75fa27d32..2ff578a16adc 100644
--- a/drivers/acpi/acpica/exnames.c
+++ b/drivers/acpi/acpica/exnames.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exnames - interpreter/scanner name load/execute
@@ -53,8 +52,7 @@ ACPI_MODULE_NAME("exnames")
 /* Local prototypes */
 static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs);
 
-static acpi_status
-acpi_ex_name_segment(u8 ** in_aml_address, char *name_string);
+static acpi_status acpi_ex_name_segment(u8 **in_aml_address, char *name_string);
 
 /*******************************************************************************
  *
@@ -64,7 +62,7 @@ acpi_ex_name_segment(u8 ** in_aml_address, char *name_string);
  *                                    (-1)==root,  0==none
  *              num_name_segs       - count of 4-character name segments
  *
- * RETURN:      A pointer to the allocated string segment.  This segment must
+ * RETURN:      A pointer to the allocated string segment. This segment must
  *              be deleted by the caller.
  *
  * DESCRIPTION: Allocate a buffer for a name string. Ensure allocated name
@@ -178,7 +176,8 @@ 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]));
diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index 9ba8c73cea16..bbf01e9bf057 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exoparg1 - AML execution - opcodes with 1 argument
@@ -606,7 +605,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                 }
 
                 /*
-                 * Set result to ONES (TRUE) if Value == 0.  Note:
+                 * Set result to ONES (TRUE) if Value == 0. Note:
                  * return_desc->Integer.Value is initially == 0 (FALSE) from above.
                  */
                 if (!operand[0]->integer.value) {
@@ -618,7 +617,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
         case AML_INCREMENT_OP:  /* Increment (Operand)  */
 
                 /*
-                 * Create a new integer.  Can't just get the base integer and
+                 * Create a new integer. Can't just get the base integer and
                  * increment it because it may be an Arg or Field.
                  */
                 return_desc = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
@@ -686,7 +685,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
 
                 /*
                  * Note: The operand is not resolved at this point because we want to
-                 * get the associated object, not its value.  For example, we don't
+                 * get the associated object, not its value. For example, we don't
                  * want to resolve a field_unit to its value, we want the actual
                  * field_unit object.
                  */
@@ -727,7 +726,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
 
                 /*
                  * The type of the base object must be integer, buffer, string, or
-                 * package.  All others are not supported.
+                 * package. All others are not supported.
                  *
                  * NOTE: Integer is not specifically supported by the ACPI spec,
                  * but is supported implicitly via implicit operand conversion.
@@ -965,7 +964,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                 case ACPI_TYPE_PACKAGE:
 
                                         /*
-                                         * Return the referenced element of the package.  We must
+                                         * Return the referenced element of the package. We must
                                          * add another reference to the referenced object, however.
                                          */
                                         return_desc =
diff --git a/drivers/acpi/acpica/exoparg2.c b/drivers/acpi/acpica/exoparg2.c
index 879e8a277b94..ee5634a074c4 100644
--- a/drivers/acpi/acpica/exoparg2.c
+++ b/drivers/acpi/acpica/exoparg2.c
@@ -123,7 +123,7 @@ acpi_status acpi_ex_opcode_2A_0T_0R(struct acpi_walk_state *walk_state)
                 /*
                  * Dispatch the notify to the appropriate handler
                  * NOTE: the request is queued for execution after this method
-                 * completes.  The notify handlers are NOT invoked synchronously
+                 * completes. The notify handlers are NOT invoked synchronously
                  * from this thread -- because handlers may in turn run other
                  * control methods.
                  */
diff --git a/drivers/acpi/acpica/exoparg3.c b/drivers/acpi/acpica/exoparg3.c
index 71fcc65c9ffa..2c89b4651f08 100644
--- a/drivers/acpi/acpica/exoparg3.c
+++ b/drivers/acpi/acpica/exoparg3.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exoparg3 - AML execution - opcodes with 3 arguments
@@ -158,7 +157,7 @@ acpi_status acpi_ex_opcode_3A_1T_1R(struct acpi_walk_state *walk_state)
         case AML_MID_OP:        /* Mid (Source[0], Index[1], Length[2], Result[3]) */
 
                 /*
-                 * Create the return object.  The Source operand is guaranteed to be
+                 * Create the return object. The Source operand is guaranteed to be
                  * either a String or a Buffer, so just use its type.
                  */
                 return_desc = acpi_ut_create_internal_object((operand[0])->
diff --git a/drivers/acpi/acpica/exoparg6.c b/drivers/acpi/acpica/exoparg6.c
index 0786b8659061..3e08695c3b30 100644
--- a/drivers/acpi/acpica/exoparg6.c
+++ b/drivers/acpi/acpica/exoparg6.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exoparg6 - AML execution - opcodes with 6 arguments
@@ -198,7 +197,7 @@ acpi_ex_do_match(u32 match_op,
                 return (FALSE);
         }
 
-        return logical_result;
+        return (logical_result);
 }
 
 /*******************************************************************************
@@ -269,7 +268,7 @@ acpi_status acpi_ex_opcode_6A_0T_1R(struct acpi_walk_state * walk_state)
                  * and the next should be examined.
                  *
                  * Upon finding a match, the loop will terminate via "break" at
-                 * the bottom.  If it terminates "normally", match_value will be
+                 * the bottom. If it terminates "normally", match_value will be
                  * ACPI_UINT64_MAX (Ones) (its initial value) indicating that no
                  * match was found.
                  */
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c
index 81eca60d2748..ba9db4de7c89 100644
--- a/drivers/acpi/acpica/exprep.c
+++ b/drivers/acpi/acpica/exprep.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exprep - ACPI AML (p-code) execution - field prep utilities
@@ -78,8 +77,8 @@ acpi_ex_generate_access(u32 field_bit_offset,
  *              any_acc keyword.
  *
  * NOTE: Need to have the region_length in order to check for boundary
- *       conditions (end-of-region).  However, the region_length is a deferred
- *       operation.  Therefore, to complete this implementation, the generation
+ *       conditions (end-of-region). However, the region_length is a deferred
+ *       operation. Therefore, to complete this implementation, the generation
  *       of this access width must be deferred until the region length has
  *       been evaluated.
  *
@@ -308,7 +307,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
  * RETURN:      Status
  *
  * DESCRIPTION: Initialize the areas of the field object that are common
- *              to the various types of fields.  Note: This is very "sensitive"
+ *              to the various types of fields. Note: This is very "sensitive"
  *              code because we are solving the general case for field
  *              alignment.
  *
@@ -336,13 +335,13 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
         obj_desc->common_field.bit_length = field_bit_length;
 
         /*
-         * Decode the access type so we can compute offsets.  The access type gives
+         * Decode the access type so we can compute offsets. The access type gives
          * two pieces of information - the width of each field access and the
          * necessary byte_alignment (address granularity) of the access.
          *
          * For any_acc, the access_bit_width is the largest width that is both
          * necessary and possible in an attempt to access the whole field in one
-         * I/O operation.  However, for any_acc, the byte_alignment is always one
+         * I/O operation. However, for any_acc, the byte_alignment is always one
          * byte.
          *
          * For all Buffer Fields, the byte_alignment is always one byte.
@@ -363,7 +362,7 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
 
         /*
          * base_byte_offset is the address of the start of the field within the
-         * region.  It is the byte address of the first *datum* (field-width data
+         * region. It is the byte address of the first *datum* (field-width data
          * unit) of the field. (i.e., the first datum that contains at least the
          * first *bit* of the field.)
          *
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 1f1ce0c3d2f8..1db2c0bfde0b 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exregion - ACPI default op_region (address space) handlers
@@ -202,7 +201,7 @@ acpi_ex_system_memory_space_handler(u32 function,
          * Perform the memory read or write
          *
          * Note: For machines that do not support non-aligned transfers, the target
-         * address was checked for alignment above.  We do not attempt to break the
+         * address was checked for alignment above. We do not attempt to break the
          * transfer up into smaller (byte-size) chunks because the AML specifically
          * asked for a transfer width that the hardware may require.
          */
diff --git a/drivers/acpi/acpica/exresnte.c b/drivers/acpi/acpica/exresnte.c
index fa50e77e64a8..6239956786eb 100644
--- a/drivers/acpi/acpica/exresnte.c
+++ b/drivers/acpi/acpica/exresnte.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exresnte - AML Interpreter object resolution
@@ -58,8 +57,8 @@ ACPI_MODULE_NAME("exresnte")
  * PARAMETERS:  object_ptr      - Pointer to a location that contains
  *                                a pointer to a NS node, and will receive a
  *                                pointer to the resolved object.
- *              walk_state      - Current state.  Valid only if executing AML
- *                                code.  NULL if simply resolving an object
+ *              walk_state      - Current state. Valid only if executing AML
+ *                                code. NULL if simply resolving an object
  *
  * RETURN:      Status
  *
@@ -67,7 +66,7 @@ ACPI_MODULE_NAME("exresnte")
  *
  * Note: for some of the data types, the pointer attached to the Node
  * can be either a pointer to an actual internal object or a pointer into the
- * AML stream itself.  These types are currently:
+ * AML stream itself. These types are currently:
  *
  *      ACPI_TYPE_INTEGER
  *      ACPI_TYPE_STRING
@@ -89,7 +88,7 @@ acpi_ex_resolve_node_to_value(struct acpi_namespace_node **object_ptr,
         ACPI_FUNCTION_TRACE(ex_resolve_node_to_value);
 
         /*
-         * The stack pointer points to a struct acpi_namespace_node (Node).  Get the
+         * The stack pointer points to a struct acpi_namespace_node (Node). Get the
          * object that is attached to the Node.
          */
         node = *object_ptr;
diff --git a/drivers/acpi/acpica/exresolv.c b/drivers/acpi/acpica/exresolv.c
index bbf40ac27585..cc176b245e22 100644
--- a/drivers/acpi/acpica/exresolv.c
+++ b/drivers/acpi/acpica/exresolv.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exresolv - AML Interpreter object resolution
@@ -327,7 +326,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Return the base object and type.  Traverse a reference list if
+ * DESCRIPTION: Return the base object and type. Traverse a reference list if
  *              necessary to get to the base object.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index f232fbabdea8..b9ebff2f6a09 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exresop - AML Interpreter operand/object resolution
@@ -87,7 +86,7 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
         if (type_needed == ACPI_TYPE_LOCAL_REFERENCE) {
                 /*
                  * Allow the AML "Constant" opcodes (Zero, One, etc.) to be reference
-                 * objects and thus allow them to be targets.  (As per the ACPI
+                 * objects and thus allow them to be targets. (As per the ACPI
                  * specification, a store to a constant is a noop.)
                  */
                 if ((this_type == ACPI_TYPE_INTEGER) &&
@@ -337,7 +336,8 @@ acpi_ex_resolve_operands(u16 opcode,
                         if ((opcode == AML_STORE_OP) &&
                             ((*stack_ptr)->common.type ==
                              ACPI_TYPE_LOCAL_REFERENCE)
-                            && ((*stack_ptr)->reference.class == ACPI_REFCLASS_INDEX)) {
+                            && ((*stack_ptr)->reference.class ==
+                                ACPI_REFCLASS_INDEX)) {
                                 goto next_operand;
                         }
                         break;
@@ -638,7 +638,7 @@ acpi_ex_resolve_operands(u16 opcode,
                                 if (acpi_gbl_enable_interpreter_slack) {
                                         /*
                                          * Enable original behavior of Store(), allowing any and all
-                                         * objects as the source operand.  The ACPI spec does not
+                                         * objects as the source operand. The ACPI spec does not
                                          * allow this, however.
                                          */
                                         break;
diff --git a/drivers/acpi/acpica/exstore.c b/drivers/acpi/acpica/exstore.c
index 5fffe7ab5ece..90431f12f831 100644
--- a/drivers/acpi/acpica/exstore.c
+++ b/drivers/acpi/acpica/exstore.c
@@ -374,7 +374,7 @@ acpi_ex_store_object_to_index(union acpi_operand_object *source_desc,
  *              with the input value.
  *
  *              When storing into an object the data is converted to the
- *              target object type then stored in the object.  This means
+ *              target object type then stored in the object. This means
  *              that the target object type (for an initialized target) will
  *              not be changed by a store operation.
  *
@@ -491,7 +491,7 @@ acpi_ex_store_object_to_node(union acpi_operand_object *source_desc,
                                   acpi_ut_get_object_type_name(source_desc),
                                   source_desc, node));
 
-                /* No conversions for all other types.  Just attach the source object */
+                /* No conversions for all other types. Just attach the source object */
 
                 status = acpi_ns_attach_object(node, source_desc,
                                                source_desc->common.type);
diff --git a/drivers/acpi/acpica/exstoren.c b/drivers/acpi/acpica/exstoren.c
index b35bed52e061..87153bbc4b43 100644
--- a/drivers/acpi/acpica/exstoren.c
+++ b/drivers/acpi/acpica/exstoren.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exstoren - AML Interpreter object store support,
@@ -61,7 +60,7 @@ ACPI_MODULE_NAME("exstoren")
  *
  * RETURN:      Status, resolved object in source_desc_ptr.
  *
- * DESCRIPTION: Resolve an object.  If the object is a reference, dereference
+ * DESCRIPTION: Resolve an object. If the object is a reference, dereference
  *              it and return the actual object in the source_desc_ptr.
  *
  ******************************************************************************/
@@ -93,7 +92,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
 
                 /*
                  * Stores into a Field/Region or into a Integer/Buffer/String
-                 * are all essentially the same.  This case handles the
+                 * are all essentially the same. This case handles the
                  * "interchangeable" types Integer, String, and Buffer.
                  */
                 if (source_desc->common.type == ACPI_TYPE_LOCAL_REFERENCE) {
@@ -167,7 +166,7 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: "Store" an object to another object.  This may include
+ * DESCRIPTION: "Store" an object to another object. This may include
  *              converting the source type to the target type (implicit
  *              conversion), and a copy of the value of the source to
  *              the target.
@@ -178,14 +177,14 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
  *              with the input value.
  *
  *              When storing into an object the data is converted to the
- *              target object type then stored in the object.  This means
+ *              target object type then stored in the object. This means
  *              that the target object type (for an initialized target) will
  *              not be changed by a store operation.
  *
  *              This module allows destination types of Number, String,
  *              Buffer, and Package.
  *
- *              Assumes parameters are already validated.  NOTE: source_desc
+ *              Assumes parameters are already validated. NOTE: source_desc
  *              resolution (from a reference object) must be performed by
  *              the caller if necessary.
  *
diff --git a/drivers/acpi/acpica/exstorob.c b/drivers/acpi/acpica/exstorob.c
index 53c248473547..b5f339cb1305 100644
--- a/drivers/acpi/acpica/exstorob.c
+++ b/drivers/acpi/acpica/exstorob.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exstorob - AML Interpreter object store support, store to object
@@ -108,7 +107,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
 #ifdef ACPI_OBSOLETE_BEHAVIOR
                 /*
                  * NOTE: ACPI versions up to 3.0 specified that the buffer must be
-                 * truncated if the string is smaller than the buffer.  However, "other"
+                 * truncated if the string is smaller than the buffer. However, "other"
                  * implementations of ACPI never did this and thus became the defacto
                  * standard. ACPI 3.0A changes this behavior such that the buffer
                  * is no longer truncated.
@@ -117,7 +116,7 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc,
                 /*
                  * OBSOLETE BEHAVIOR:
                  * If the original source was a string, we must truncate the buffer,
-                 * according to the ACPI spec.  Integer-to-Buffer and Buffer-to-Buffer
+                 * according to the ACPI spec. Integer-to-Buffer and Buffer-to-Buffer
                  * copy must not truncate the original buffer.
                  */
                 if (original_src_type == ACPI_TYPE_STRING) {
diff --git a/drivers/acpi/acpica/exsystem.c b/drivers/acpi/acpica/exsystem.c
index b760641e2fc6..c8a0ad5c1f55 100644
--- a/drivers/acpi/acpica/exsystem.c
+++ b/drivers/acpi/acpica/exsystem.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exsystem - Interface to OS services
@@ -59,7 +58,7 @@ ACPI_MODULE_NAME("exsystem")
  * RETURN:      Status
  *
  * DESCRIPTION: Implements a semaphore wait with a check to see if the
- *              semaphore is available immediately.  If it is not, the
+ *              semaphore is available immediately. If it is not, the
  *              interpreter is released before waiting.
  *
  ******************************************************************************/
@@ -104,7 +103,7 @@ acpi_status acpi_ex_system_wait_semaphore(acpi_semaphore semaphore, u16 timeout)
  * RETURN:      Status
  *
  * DESCRIPTION: Implements a mutex wait with a check to see if the
- *              mutex is available immediately.  If it is not, the
+ *              mutex is available immediately. If it is not, the
  *              interpreter is released before waiting.
  *
  ******************************************************************************/
@@ -152,7 +151,7 @@ acpi_status acpi_ex_system_wait_mutex(acpi_mutex mutex, u16 timeout)
  * DESCRIPTION: Suspend running thread for specified amount of time.
  *              Note: ACPI specification requires that Stall() does not
  *              relinquish the processor, and delays longer than 100 usec
- *              should use Sleep() instead.  We allow stalls up to 255 usec
+ *              should use Sleep() instead. We allow stalls up to 255 usec
  *              for compatibility with other interpreters and existing BIOSs.
  *
  ******************************************************************************/
@@ -254,7 +253,7 @@ acpi_status acpi_ex_system_signal_event(union acpi_operand_object * obj_desc)
  * RETURN:      Status
  *
  * DESCRIPTION: Provides an access point to perform synchronization operations
- *              within the AML.  This operation is a request to wait for an
+ *              within the AML. This operation is a request to wait for an
  *              event.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/exutils.c b/drivers/acpi/acpica/exutils.c
index d1ab7917eed7..264d22d8018c 100644
--- a/drivers/acpi/acpica/exutils.c
+++ b/drivers/acpi/acpica/exutils.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: exutils - interpreter/scanner utilities
@@ -45,12 +44,12 @@
 /*
  * DEFINE_AML_GLOBALS is tested in amlcode.h
  * to determine whether certain global names should be "defined" or only
- * "declared" in the current compilation.  This enhances maintainability
+ * "declared" in the current compilation. This enhances maintainability
  * by enabling a single header file to embody all knowledge of the names
  * in question.
  *
  * Exactly one module of any executable should #define DEFINE_GLOBALS
- * before #including the header files which use this convention.  The
+ * before #including the header files which use this convention. The
  * names in question will be defined and initialized in that module,
  * and declared as extern in all other modules which #include those
  * header files.
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index a1e71d0ef57b..90a9aea1cee9 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: hwacpi - ACPI Hardware Initialization/Mode Interface
@@ -136,7 +135,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
  *
  * RETURN:      SYS_MODE_ACPI or SYS_MODE_LEGACY
  *
- * DESCRIPTION: Return current operating state of system.  Determined by
+ * DESCRIPTION: Return current operating state of system. Determined by
  *              querying the SCI_EN bit.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index db4076580e2b..64560045052d 100644
--- a/drivers/acpi/acpica/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: hwgpe - Low level GPE enable/disable/clear functions
@@ -339,7 +338,8 @@ acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
 acpi_status
 acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
-                                 struct acpi_gpe_block_info *gpe_block, void *context)
+                                 struct acpi_gpe_block_info * gpe_block,
+                                 void *context)
 {
         u32 i;
         acpi_status status;
diff --git a/drivers/acpi/acpica/hwpci.c b/drivers/acpi/acpica/hwpci.c
index 1455ddcdc32c..65bc3453a29c 100644
--- a/drivers/acpi/acpica/hwpci.c
+++ b/drivers/acpi/acpica/hwpci.c
@@ -259,7 +259,7 @@ acpi_hw_process_pci_list(struct acpi_pci_id *pci_id,
                 status = acpi_hw_get_pci_device_info(pci_id, info->device,
                                                      &bus_number, &is_bridge);
                 if (ACPI_FAILURE(status)) {
-                        return_ACPI_STATUS(status);
+                        return (status);
                 }
 
                 info = info->next;
@@ -271,7 +271,7 @@ acpi_hw_process_pci_list(struct acpi_pci_id *pci_id,
                           pci_id->segment, pci_id->bus, pci_id->device,
                           pci_id->function, status, bus_number, is_bridge));
 
-        return_ACPI_STATUS(AE_OK);
+        return (AE_OK);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index 4af6d20ef077..f4e57503576b 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -1,4 +1,3 @@
-
 /*******************************************************************************
  *
  * Module Name: hwregs - Read/write access functions for the various ACPI
diff --git a/drivers/acpi/acpica/hwtimer.c b/drivers/acpi/acpica/hwtimer.c
index b6411f16832f..bfdce22f3798 100644
--- a/drivers/acpi/acpica/hwtimer.c
+++ b/drivers/acpi/acpica/hwtimer.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Name: hwtimer.c - ACPI Power Management Timer Interface
@@ -101,8 +100,7 @@ acpi_status acpi_get_timer(u32 * ticks)
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        status =
-            acpi_hw_read(ticks, &acpi_gbl_FADT.xpm_timer_block);
+        status = acpi_hw_read(ticks, &acpi_gbl_FADT.xpm_timer_block);
 
         return_ACPI_STATUS(status);
 }
@@ -129,7 +127,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_timer)
  *              a versatile and accurate timer.
  *
  *              Note that this function accommodates only a single timer
- *              rollover.  Thus for 24-bit timers, this function should only
+ *              rollover. Thus for 24-bit timers, this function should only
  *              be used for calculating durations less than ~4.6 seconds
  *              (~20 minutes for 32-bit timers) -- calculations below:
  *
diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c
index c99d546b217f..b6aae58299dc 100644
--- a/drivers/acpi/acpica/hwvalid.c
+++ b/drivers/acpi/acpica/hwvalid.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: hwvalid - I/O request validation
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index 7bfd649d1996..05a154c3c9ac 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: hwxface - Public ACPICA hardware interfaces
diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
index 0ff1ecea5c3a..ae443fe2ebf6 100644
--- a/drivers/acpi/acpica/hwxfsleep.c
+++ b/drivers/acpi/acpica/hwxfsleep.c
@@ -49,8 +49,7 @@
 ACPI_MODULE_NAME("hwxfsleep")
 
 /* Local prototypes */
-static acpi_status
-acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
+static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
 
 /*
  * Dispatch table used to efficiently branch to the various sleep
@@ -234,8 +233,7 @@ ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_s4bios)
  *              function.
  *
  ******************************************************************************/
-static acpi_status
-acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id)
+static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id)
 {
         acpi_status status;
         struct acpi_sleep_functions *sleep_functions =
@@ -369,8 +367,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
                 return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
         }
 
-        status =
-            acpi_hw_sleep_dispatch(sleep_state, ACPI_SLEEP_FUNCTION_ID);
+        status = acpi_hw_sleep_dispatch(sleep_state, ACPI_SLEEP_FUNCTION_ID);
         return_ACPI_STATUS(status);
 }
 
@@ -396,8 +393,7 @@ acpi_status acpi_leave_sleep_state_prep(u8 sleep_state)
         ACPI_FUNCTION_TRACE(acpi_leave_sleep_state_prep);
 
         status =
-            acpi_hw_sleep_dispatch(sleep_state,
-                                   ACPI_WAKE_PREP_FUNCTION_ID);
+            acpi_hw_sleep_dispatch(sleep_state, ACPI_WAKE_PREP_FUNCTION_ID);
         return_ACPI_STATUS(status);
 }
 
diff --git a/drivers/acpi/acpica/nsaccess.c b/drivers/acpi/acpica/nsaccess.c
index 23db53ce2293..d70eaf39dfdf 100644
--- a/drivers/acpi/acpica/nsaccess.c
+++ b/drivers/acpi/acpica/nsaccess.c
@@ -110,11 +110,11 @@ acpi_status acpi_ns_root_initialize(void)
                 status = acpi_ns_lookup(NULL, init_val->name, init_val->type,
                                         ACPI_IMODE_LOAD_PASS2,
                                         ACPI_NS_NO_UPSEARCH, NULL, &new_node);
-
-                if (ACPI_FAILURE(status) || (!new_node)) {      /* Must be on same line for code converter */
+                if (ACPI_FAILURE(status)) {
                         ACPI_EXCEPTION((AE_INFO, status,
                                         "Could not create predefined name %s",
                                         init_val->name));
+                        continue;
                 }
 
                 /*
@@ -179,8 +179,7 @@ acpi_status acpi_ns_root_initialize(void)
 
                                 /* Build an object around the static string */
 
-                                obj_desc->string.length =
-                                    (u32) ACPI_STRLEN(val);
+                                obj_desc->string.length = (u32)ACPI_STRLEN(val);
                                 obj_desc->string.pointer = val;
                                 obj_desc->common.flags |= AOPOBJ_STATIC_POINTER;
                                 break;
diff --git a/drivers/acpi/acpica/nsalloc.c b/drivers/acpi/acpica/nsalloc.c
index ac389e5bb594..15143c44f5e5 100644
--- a/drivers/acpi/acpica/nsalloc.c
+++ b/drivers/acpi/acpica/nsalloc.c
@@ -332,7 +332,7 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node)
  *
  * RETURN:      None.
  *
- * DESCRIPTION: Delete a subtree of the namespace.  This includes all objects
+ * DESCRIPTION: Delete a subtree of the namespace. This includes all objects
  *              stored within the subtree.
  *
  ******************************************************************************/
@@ -418,7 +418,7 @@ void acpi_ns_delete_namespace_subtree(struct acpi_namespace_node *parent_node)
  * RETURN:      Status
  *
  * DESCRIPTION: Delete entries within the namespace that are owned by a
- *              specific ID.  Used to delete entire ACPI tables.  All
+ *              specific ID. Used to delete entire ACPI tables. All
  *              reference counts are updated.
  *
  * MUTEX:       Locks namespace during deletion walk.
diff --git a/drivers/acpi/acpica/nsdump.c b/drivers/acpi/acpica/nsdump.c
index 2526aaf945ee..924b3c71473a 100644
--- a/drivers/acpi/acpica/nsdump.c
+++ b/drivers/acpi/acpica/nsdump.c
@@ -209,14 +209,6 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
                                       "Invalid ACPI Object Type 0x%08X", type));
                 }
 
-                if (!acpi_ut_valid_acpi_name(this_node->name.integer)) {
-                        this_node->name.integer =
-                            acpi_ut_repair_name(this_node->name.ascii);
-
-                        ACPI_WARNING((AE_INFO, "Invalid ACPI Name %08X",
-                                      this_node->name.integer));
-                }
-
                 acpi_os_printf("%4.4s", acpi_ut_get_node_name(this_node));
         }
 
@@ -700,7 +692,7 @@ void acpi_ns_dump_entry(acpi_handle handle, u32 debug_level)
  *
  * PARAMETERS:  search_base         - Root of subtree to be dumped, or
  *                                    NS_ALL to dump the entire namespace
- *              max_depth           - Maximum depth of dump.  Use INT_MAX
+ *              max_depth           - Maximum depth of dump. Use INT_MAX
  *                                    for an effectively unlimited depth.
  *
  * RETURN:      None
diff --git a/drivers/acpi/acpica/nsinit.c b/drivers/acpi/acpica/nsinit.c
index 95ffe8dfa1f1..4328e2adfeb9 100644
--- a/drivers/acpi/acpica/nsinit.c
+++ b/drivers/acpi/acpica/nsinit.c
@@ -96,8 +96,8 @@ acpi_status acpi_ns_initialize_objects(void)
         /* Walk entire namespace from the supplied root */
 
         status = acpi_walk_namespace(ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
-                                     ACPI_UINT32_MAX, acpi_ns_init_one_object, NULL,
-                                     &info, NULL);
+                                     ACPI_UINT32_MAX, acpi_ns_init_one_object,
+                                     NULL, &info, NULL);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status, "During WalkNamespace"));
         }
diff --git a/drivers/acpi/acpica/nsload.c b/drivers/acpi/acpica/nsload.c
index 76935ff29289..911f99127b99 100644
--- a/drivers/acpi/acpica/nsload.c
+++ b/drivers/acpi/acpica/nsload.c
@@ -80,8 +80,8 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
 
         /*
          * Parse the table and load the namespace with all named
-         * objects found within.  Control methods are NOT parsed
-         * at this time.  In fact, the control methods cannot be
+         * objects found within. Control methods are NOT parsed
+         * at this time. In fact, the control methods cannot be
          * parsed until the entire namespace is loaded, because
          * if a control method makes a forward reference (call)
          * to another control method, we can't continue parsing
@@ -122,7 +122,7 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
         }
 
         /*
-         * Now we can parse the control methods.  We always parse
+         * Now we can parse the control methods. We always parse
          * them here for a sanity check, and if configured for
          * just-in-time parsing, we delete the control method
          * parse trees.
@@ -166,7 +166,7 @@ acpi_status acpi_ns_load_namespace(void)
         }
 
         /*
-         * Load the namespace.  The DSDT is required,
+         * Load the namespace. The DSDT is required,
          * but the SSDT and PSDT tables are optional.
          */
         status = acpi_ns_load_table_by_type(ACPI_TABLE_ID_DSDT);
@@ -283,7 +283,7 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle)
  *  RETURN:         Status
  *
  *  DESCRIPTION:    Shrinks the namespace, typically in response to an undocking
- *                  event.  Deletes an entire subtree starting from (and
+ *                  event. Deletes an entire subtree starting from (and
  *                  including) the given handle.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c
index 96e0eb609bb4..55a175eadcc3 100644
--- a/drivers/acpi/acpica/nsnames.c
+++ b/drivers/acpi/acpica/nsnames.c
@@ -195,7 +195,7 @@ acpi_size acpi_ns_get_pathname_length(struct acpi_namespace_node *node)
                         ACPI_ERROR((AE_INFO,
                                     "Invalid Namespace Node (%p) while traversing namespace",
                                     next_node));
-                        return 0;
+                        return (0);
                 }
                 size += ACPI_PATH_SEGMENT_LENGTH;
                 next_node = next_node->parent;
diff --git a/drivers/acpi/acpica/nsobject.c b/drivers/acpi/acpica/nsobject.c
index d6c9a3cc6716..e69f7fa2579d 100644
--- a/drivers/acpi/acpica/nsobject.c
+++ b/drivers/acpi/acpica/nsobject.c
@@ -61,7 +61,7 @@ ACPI_MODULE_NAME("nsobject")
  * RETURN:      Status
  *
  * DESCRIPTION: Record the given object as the value associated with the
- *              name whose acpi_handle is passed.  If Object is NULL
+ *              name whose acpi_handle is passed. If Object is NULL
  *              and Type is ACPI_TYPE_ANY, set the name as having no value.
  *              Note: Future may require that the Node->Flags field be passed
  *              as a parameter.
@@ -133,7 +133,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
                  ((struct acpi_namespace_node *)object)->object) {
                 /*
                  * Value passed is a name handle and that name has a
-                 * non-null value.  Use that name's value and type.
+                 * non-null value. Use that name's value and type.
                  */
                 obj_desc = ((struct acpi_namespace_node *)object)->object;
                 object_type = ((struct acpi_namespace_node *)object)->type;
@@ -321,7 +321,7 @@ union acpi_operand_object *acpi_ns_get_secondary_object(union
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Low-level attach data.  Create and attach a Data object.
+ * DESCRIPTION: Low-level attach data. Create and attach a Data object.
  *
  ******************************************************************************/
 
@@ -377,7 +377,7 @@ acpi_ns_attach_data(struct acpi_namespace_node *node,
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Low-level detach data.  Delete the data node, but the caller
+ * DESCRIPTION: Low-level detach data. Delete the data node, but the caller
  *              is responsible for the actual data.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/nsparse.c b/drivers/acpi/acpica/nsparse.c
index ec7ba2d3463c..233f756d5cfa 100644
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
@@ -168,11 +168,11 @@ acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
         /*
          * AML Parse, pass 1
          *
-         * In this pass, we load most of the namespace.  Control methods
-         * are not parsed until later.  A parse tree is not created.  Instead,
-         * each Parser Op subtree is deleted when it is finished.  This saves
+         * In this pass, we load most of the namespace. Control methods
+         * are not parsed until later. A parse tree is not created. Instead,
+         * each Parser Op subtree is deleted when it is finished. This saves
          * a great deal of memory, and allows a small cache of parse objects
-         * to service the entire parse.  The second pass of the parse then
+         * to service the entire parse. The second pass of the parse then
          * performs another complete parse of the AML.
          */
         ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "**** Start pass 1\n"));
diff --git a/drivers/acpi/acpica/nssearch.c b/drivers/acpi/acpica/nssearch.c
index 456cc859f869..1d2d8ffc1bc5 100644
--- a/drivers/acpi/acpica/nssearch.c
+++ b/drivers/acpi/acpica/nssearch.c
@@ -314,22 +314,7 @@ acpi_ns_search_and_enter(u32 target_name,
          * this problem, and we want to be able to enable ACPI support for them,
          * even though there are a few bad names.
          */
-        if (!acpi_ut_valid_acpi_name(target_name)) {
-                target_name =
-                    acpi_ut_repair_name(ACPI_CAST_PTR(char, &target_name));
-
-                /* Report warning only if in strict mode or debug mode */
-
-                if (!acpi_gbl_enable_interpreter_slack) {
-                        ACPI_WARNING((AE_INFO,
-                                      "Found bad character(s) in name, repaired: [%4.4s]\n",
-                                      ACPI_CAST_PTR(char, &target_name)));
-                } else {
-                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                          "Found bad character(s) in name, repaired: [%4.4s]\n",
-                                          ACPI_CAST_PTR(char, &target_name)));
-                }
-        }
+        acpi_ut_repair_name(ACPI_CAST_PTR(char, &target_name));
 
         /* Try to find the name in the namespace level specified by the caller */
 
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index ef753a41e087..b5b4cb72a8a8 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -530,7 +530,7 @@ acpi_ns_externalize_name(u32 internal_name_length,
             ((num_segments > 0) ? (num_segments - 1) : 0) + 1;
 
         /*
-         * Check to see if we're still in bounds.  If not, there's a problem
+         * Check to see if we're still in bounds. If not, there's a problem
          * with internal_name (invalid format).
          */
         if (required_length > internal_name_length) {
@@ -557,10 +557,14 @@ acpi_ns_externalize_name(u32 internal_name_length,
                                 (*converted_name)[j++] = '.';
                         }
 
-                        (*converted_name)[j++] = internal_name[names_index++];
-                        (*converted_name)[j++] = internal_name[names_index++];
-                        (*converted_name)[j++] = internal_name[names_index++];
-                        (*converted_name)[j++] = internal_name[names_index++];
+                        /* Copy and validate the 4-char name segment */
+
+                        ACPI_MOVE_NAME(&(*converted_name)[j],
+                                       &internal_name[names_index]);
+                        acpi_ut_repair_name(&(*converted_name)[j]);
+
+                        j += ACPI_NAME_SIZE;
+                        names_index += ACPI_NAME_SIZE;
                 }
         }
 
@@ -681,7 +685,7 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
  *                            \ (backslash) and ^ (carat) prefixes, and the
  *                            . (period) to separate segments are supported.
  *              prefix_node  - Root of subtree to be searched, or NS_ALL for the
- *                            root of the name space.  If Name is fully
+ *                            root of the name space. If Name is fully
  *                            qualified (first s8 is '\'), the passed value
  *                            of Scope will not be accessed.
  *              flags       - Used to indicate whether to perform upsearch or
@@ -689,7 +693,7 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
  *              return_node - Where the Node is returned
  *
  * DESCRIPTION: Look up a name relative to a given scope and return the
- *              corresponding Node.  NOTE: Scope can be null.
+ *              corresponding Node. NOTE: Scope can be null.
  *
  * MUTEX:       Locks namespace
  *
diff --git a/drivers/acpi/acpica/nswalk.c b/drivers/acpi/acpica/nswalk.c
index 730bccc5e7f7..0483877f26b8 100644
--- a/drivers/acpi/acpica/nswalk.c
+++ b/drivers/acpi/acpica/nswalk.c
@@ -60,8 +60,8 @@ ACPI_MODULE_NAME("nswalk")
  * RETURN:      struct acpi_namespace_node - Pointer to the NEXT child or NULL if
  *                                    none is found.
  *
- * DESCRIPTION: Return the next peer node within the namespace.  If Handle
- *              is valid, Scope is ignored.  Otherwise, the first node
+ * DESCRIPTION: Return the next peer node within the namespace. If Handle
+ *              is valid, Scope is ignored. Otherwise, the first node
  *              within Scope is returned.
  *
  ******************************************************************************/
@@ -97,8 +97,8 @@ struct acpi_namespace_node *acpi_ns_get_next_node(struct acpi_namespace_node
  * RETURN:      struct acpi_namespace_node - Pointer to the NEXT child or NULL if
  *                                    none is found.
  *
- * DESCRIPTION: Return the next peer node within the namespace.  If Handle
- *              is valid, Scope is ignored.  Otherwise, the first node
+ * DESCRIPTION: Return the next peer node within the namespace. If Handle
+ *              is valid, Scope is ignored. Otherwise, the first node
  *              within Scope is returned.
  *
  ******************************************************************************/
@@ -305,7 +305,7 @@ acpi_ns_walk_namespace(acpi_object_type type,
 
                 /*
                  * Depth first search: Attempt to go down another level in the
-                 * namespace if we are allowed to.  Don't go any further if we have
+                 * namespace if we are allowed to. Don't go any further if we have
                  * reached the caller specified maximum depth or if the user
                  * function has specified that the maximum depth has been reached.
                  */
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index 9692e6702333..d6a9f77972b6 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -61,16 +61,16 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info);
  * PARAMETERS:  handle              - Object handle (optional)
  *              pathname            - Object pathname (optional)
  *              external_params     - List of parameters to pass to method,
- *                                    terminated by NULL.  May be NULL
+ *                                    terminated by NULL. May be NULL
  *                                    if no parameters are being passed.
  *              return_buffer       - Where to put method's return value (if
- *                                    any).  If NULL, no value is returned.
+ *                                    any). If NULL, no value is returned.
  *              return_type         - Expected type of return object
  *
  * RETURN:      Status
  *
  * DESCRIPTION: Find and evaluate the given object, passing the given
- *              parameters if necessary.  One of "Handle" or "Pathname" must
+ *              parameters if necessary. One of "Handle" or "Pathname" must
  *              be valid (non-null)
  *
  ******************************************************************************/
@@ -155,15 +155,15 @@ ACPI_EXPORT_SYMBOL(acpi_evaluate_object_typed)
  * PARAMETERS:  handle              - Object handle (optional)
  *              pathname            - Object pathname (optional)
  *              external_params     - List of parameters to pass to method,
- *                                    terminated by NULL.  May be NULL
+ *                                    terminated by NULL. May be NULL
  *                                    if no parameters are being passed.
  *              return_buffer       - Where to put method's return value (if
- *                                    any).  If NULL, no value is returned.
+ *                                    any). If NULL, no value is returned.
  *
  * RETURN:      Status
  *
  * DESCRIPTION: Find and evaluate the given object, passing the given
- *              parameters if necessary.  One of "Handle" or "Pathname" must
+ *              parameters if necessary. One of "Handle" or "Pathname" must
  *              be valid (non-null)
  *
  ******************************************************************************/
@@ -542,15 +542,15 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
         acpi_status status;
         struct acpi_namespace_node *node;
         u32 flags;
-        struct acpica_device_id *hid;
-        struct acpica_device_id_list *cid;
+        struct acpi_pnp_device_id *hid;
+        struct acpi_pnp_device_id_list *cid;
         u32 i;
         u8 found;
         int no_match;
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
         if (ACPI_FAILURE(status)) {
-                return (status);
+                return_ACPI_STATUS(status);
         }
 
         node = acpi_ns_validate_handle(obj_handle);
@@ -656,7 +656,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
  * DESCRIPTION: Performs a modified depth-first walk of the namespace tree,
  *              starting (and ending) at the object specified by start_handle.
  *              The user_function is called whenever an object of type
- *              Device is found.  If the user function returns
+ *              Device is found. If the user function returns
  *              a non-zero value, the search is terminated immediately and this
  *              value is returned to the caller.
  *
diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index 08e9610b34ca..811c6f13f476 100644
--- a/drivers/acpi/acpica/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -53,8 +53,8 @@
 ACPI_MODULE_NAME("nsxfname")
 
 /* Local prototypes */
-static char *acpi_ns_copy_device_id(struct acpica_device_id *dest,
-                                    struct acpica_device_id *source,
+static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,
+                                    struct acpi_pnp_device_id *source,
                                     char *string_area);
 
 /******************************************************************************
@@ -69,8 +69,8 @@ static char *acpi_ns_copy_device_id(struct acpica_device_id *dest,
  * RETURN:      Status
  *
  * DESCRIPTION: This routine will search for a caller specified name in the
- *              name space.  The caller can restrict the search region by
- *              specifying a non NULL parent.  The parent value is itself a
+ *              name space. The caller can restrict the search region by
+ *              specifying a non NULL parent. The parent value is itself a
  *              namespace handle.
  *
  ******************************************************************************/
@@ -149,7 +149,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_handle)
  * RETURN:      Pointer to a string containing the fully qualified Name.
  *
  * DESCRIPTION: This routine returns the fully qualified name associated with
- *              the Handle parameter.  This and the acpi_pathname_to_handle are
+ *              the Handle parameter. This and the acpi_pathname_to_handle are
  *              complementary functions.
  *
  ******************************************************************************/
@@ -202,8 +202,7 @@ acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer * buffer)
 
         /* Just copy the ACPI name from the Node and zero terminate it */
 
-        ACPI_STRNCPY(buffer->pointer, acpi_ut_get_node_name(node),
-                     ACPI_NAME_SIZE);
+        ACPI_MOVE_NAME(buffer->pointer, acpi_ut_get_node_name(node));
         ((char *)buffer->pointer)[ACPI_NAME_SIZE] = 0;
         status = AE_OK;
 
@@ -219,20 +218,21 @@ ACPI_EXPORT_SYMBOL(acpi_get_name)
  *
  * FUNCTION:    acpi_ns_copy_device_id
  *
- * PARAMETERS:  dest                - Pointer to the destination DEVICE_ID
- *              source              - Pointer to the source DEVICE_ID
+ * PARAMETERS:  dest                - Pointer to the destination PNP_DEVICE_ID
+ *              source              - Pointer to the source PNP_DEVICE_ID
  *              string_area         - Pointer to where to copy the dest string
  *
  * RETURN:      Pointer to the next string area
  *
- * DESCRIPTION: Copy a single DEVICE_ID, including the string data.
+ * DESCRIPTION: Copy a single PNP_DEVICE_ID, including the string data.
  *
  ******************************************************************************/
-static char *acpi_ns_copy_device_id(struct acpica_device_id *dest,
-                                    struct acpica_device_id *source,
+static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,
+                                    struct acpi_pnp_device_id *source,
                                     char *string_area)
 {
-        /* Create the destination DEVICE_ID */
+
+        /* Create the destination PNP_DEVICE_ID */
 
         dest->string = string_area;
         dest->length = source->length;
@@ -256,8 +256,8 @@ static char *acpi_ns_copy_device_id(struct acpica_device_id *dest,
  *              namespace node and possibly by running several standard
  *              control methods (Such as in the case of a device.)
  *
- * For Device and Processor objects, run the Device _HID, _UID, _CID, _STA,
- * _ADR, _sx_w, and _sx_d methods.
+ * For Device and Processor objects, run the Device _HID, _UID, _CID, _SUB,
+ * _STA, _ADR, _sx_w, and _sx_d methods.
  *
  * Note: Allocates the return buffer, must be freed by the caller.
  *
@@ -269,9 +269,10 @@ acpi_get_object_info(acpi_handle handle,
 {
         struct acpi_namespace_node *node;
         struct acpi_device_info *info;
-        struct acpica_device_id_list *cid_list = NULL;
-        struct acpica_device_id *hid = NULL;
-        struct acpica_device_id *uid = NULL;
+        struct acpi_pnp_device_id_list *cid_list = NULL;
+        struct acpi_pnp_device_id *hid = NULL;
+        struct acpi_pnp_device_id *uid = NULL;
+        struct acpi_pnp_device_id *sub = NULL;
         char *next_id_string;
         acpi_object_type type;
         acpi_name name;
@@ -316,7 +317,7 @@ acpi_get_object_info(acpi_handle handle,
         if ((type == ACPI_TYPE_DEVICE) || (type == ACPI_TYPE_PROCESSOR)) {
                 /*
                  * Get extra info for ACPI Device/Processor objects only:
-                 * Run the Device _HID, _UID, and _CID methods.
+                 * Run the Device _HID, _UID, _SUB, and _CID methods.
                  *
                  * Note: none of these methods are required, so they may or may
                  * not be present for this device. The Info->Valid bitfield is used
@@ -339,6 +340,14 @@ acpi_get_object_info(acpi_handle handle,
                         valid |= ACPI_VALID_UID;
                 }
 
+                /* Execute the Device._SUB method */
+
+                status = acpi_ut_execute_SUB(node, &sub);
+                if (ACPI_SUCCESS(status)) {
+                        info_size += sub->length;
+                        valid |= ACPI_VALID_SUB;
+                }
+
                 /* Execute the Device._CID method */
 
                 status = acpi_ut_execute_CID(node, &cid_list);
@@ -348,7 +357,7 @@ acpi_get_object_info(acpi_handle handle,
 
                         info_size +=
                             (cid_list->list_size -
-                             sizeof(struct acpica_device_id_list));
+                             sizeof(struct acpi_pnp_device_id_list));
                         valid |= ACPI_VALID_CID;
                 }
         }
@@ -418,16 +427,17 @@ acpi_get_object_info(acpi_handle handle,
         next_id_string = ACPI_CAST_PTR(char, info->compatible_id_list.ids);
         if (cid_list) {
 
-                /* Point past the CID DEVICE_ID array */
+                /* Point past the CID PNP_DEVICE_ID array */
 
                 next_id_string +=
                     ((acpi_size) cid_list->count *
-                     sizeof(struct acpica_device_id));
+                     sizeof(struct acpi_pnp_device_id));
         }
 
         /*
-         * Copy the HID, UID, and CIDs to the return buffer. The variable-length
-         * strings are copied to the reserved area at the end of the buffer.
+         * Copy the HID, UID, SUB, and CIDs to the return buffer.
+         * The variable-length strings are copied to the reserved area
+         * at the end of the buffer.
          *
          * For HID and CID, check if the ID is a PCI Root Bridge.
          */
@@ -445,6 +455,11 @@ acpi_get_object_info(acpi_handle handle,
                                                         uid, next_id_string);
         }
 
+        if (sub) {
+                next_id_string = acpi_ns_copy_device_id(&info->subsystem_id,
+                                                        sub, next_id_string);
+        }
+
         if (cid_list) {
                 info->compatible_id_list.count = cid_list->count;
                 info->compatible_id_list.list_size = cid_list->list_size;
@@ -481,6 +496,9 @@ acpi_get_object_info(acpi_handle handle,
         if (uid) {
                 ACPI_FREE(uid);
         }
+        if (sub) {
+                ACPI_FREE(sub);
+        }
         if (cid_list) {
                 ACPI_FREE(cid_list);
         }
diff --git a/drivers/acpi/acpica/nsxfobj.c b/drivers/acpi/acpica/nsxfobj.c
index 6766fc4f088f..9d029dac6b64 100644
--- a/drivers/acpi/acpica/nsxfobj.c
+++ b/drivers/acpi/acpica/nsxfobj.c
@@ -220,8 +220,8 @@ ACPI_EXPORT_SYMBOL(acpi_get_parent)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Return the next peer object within the namespace.  If Handle is
- *              valid, Scope is ignored.  Otherwise, the first object within
+ * DESCRIPTION: Return the next peer object within the namespace. If Handle is
+ *              valid, Scope is ignored. Otherwise, the first object within
  *              Scope is returned.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/psargs.c b/drivers/acpi/acpica/psargs.c
index 844464c4f901..cb79e2d4d743 100644
--- a/drivers/acpi/acpica/psargs.c
+++ b/drivers/acpi/acpica/psargs.c
@@ -120,7 +120,7 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state)
  * RETURN:      Pointer to end-of-package +1
  *
  * DESCRIPTION: Get next package length and return a pointer past the end of
- *              the package.  Consumes the package length field
+ *              the package. Consumes the package length field
  *
  ******************************************************************************/
 
@@ -147,8 +147,8 @@ u8 *acpi_ps_get_next_package_end(struct acpi_parse_state *parser_state)
  * RETURN:      Pointer to the start of the name string (pointer points into
  *              the AML.
  *
- * DESCRIPTION: Get next raw namestring within the AML stream.  Handles all name
- *              prefix characters.  Set parser state to point past the string.
+ * DESCRIPTION: Get next raw namestring within the AML stream. Handles all name
+ *              prefix characters. Set parser state to point past the string.
  *              (Name is consumed from the AML.)
  *
  ******************************************************************************/
@@ -220,7 +220,7 @@ char *acpi_ps_get_next_namestring(struct acpi_parse_state *parser_state)
  *
  * DESCRIPTION: Get next name (if method call, return # of required args).
  *              Names are looked up in the internal namespace to determine
- *              if the name represents a control method.  If a method
+ *              if the name represents a control method. If a method
  *              is found, the number of arguments to the method is returned.
  *              This information is critical for parsing to continue correctly.
  *
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c
index 799162c1b6df..5607805aab26 100644
--- a/drivers/acpi/acpica/psloop.c
+++ b/drivers/acpi/acpica/psloop.c
@@ -133,18 +133,46 @@ static acpi_status acpi_ps_get_aml_opcode(struct acpi_walk_state *walk_state)
 
         case AML_CLASS_UNKNOWN:
 
-                /* The opcode is unrecognized. Just skip unknown opcodes */
+                /* The opcode is unrecognized. Complain and skip unknown opcodes */
 
-                ACPI_ERROR((AE_INFO,
-                            "Found unknown opcode 0x%X at AML address %p offset 0x%X, ignoring",
-                            walk_state->opcode, walk_state->parser_state.aml,
-                            walk_state->aml_offset));
+                if (walk_state->pass_number == 2) {
+                        ACPI_ERROR((AE_INFO,
+                                    "Unknown opcode 0x%.2X at table offset 0x%.4X, ignoring",
+                                    walk_state->opcode,
+                                    (u32)(walk_state->aml_offset +
+                                          sizeof(struct acpi_table_header))));
 
-                ACPI_DUMP_BUFFER(walk_state->parser_state.aml, 128);
+                        ACPI_DUMP_BUFFER(walk_state->parser_state.aml - 16, 48);
 
-                /* Assume one-byte bad opcode */
+#ifdef ACPI_ASL_COMPILER
+                        /*
+                         * This is executed for the disassembler only. Output goes
+                         * to the disassembled ASL output file.
+                         */
+                        acpi_os_printf
+                            ("/*\nError: Unknown opcode 0x%.2X at table offset 0x%.4X, context:\n",
+                             walk_state->opcode,
+                             (u32)(walk_state->aml_offset +
+                                   sizeof(struct acpi_table_header)));
+
+                        /* Dump the context surrounding the invalid opcode */
+
+                        acpi_ut_dump_buffer(((u8 *)walk_state->parser_state.
+                                             aml - 16), 48, DB_BYTE_DISPLAY,
+                                            walk_state->aml_offset +
+                                            sizeof(struct acpi_table_header) -
+                                            16);
+                        acpi_os_printf(" */\n");
+#endif
+                }
+
+                /* Increment past one-byte or two-byte opcode */
 
                 walk_state->parser_state.aml++;
+                if (walk_state->opcode > 0xFF) {        /* Can only happen if first byte is 0x5B */
+                        walk_state->parser_state.aml++;
+                }
+
                 return_ACPI_STATUS(AE_CTRL_PARSE_CONTINUE);
 
         default:
@@ -519,11 +547,18 @@ acpi_ps_get_arguments(struct acpi_walk_state *walk_state,
                                         if ((op_info->class ==
                                              AML_CLASS_EXECUTE) && (!arg)) {
                                                 ACPI_WARNING((AE_INFO,
-                                                              "Detected an unsupported executable opcode "
-                                                              "at module-level: [0x%.4X] at table offset 0x%.4X",
-                                                              op->common.aml_opcode,
-                                                              (u32)((aml_op_start - walk_state->parser_state.aml_start)
-                                                                + sizeof(struct acpi_table_header))));
+                                                              "Unsupported module-level executable opcode "
+                                                              "0x%.2X at table offset 0x%.4X",
+                                                              op->common.
+                                                              aml_opcode,
+                                                              (u32)
+                                                              (ACPI_PTR_DIFF
+                                                               (aml_op_start,
+                                                                walk_state->
+                                                                parser_state.
+                                                                aml_start) +
+                                                               sizeof(struct
+                                                                      acpi_table_header))));
                                         }
                                 }
                                 break;
@@ -843,8 +878,6 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state,
                 *op = NULL;
         }
 
-        ACPI_PREEMPTION_POINT();
-
         return_ACPI_STATUS(AE_OK);
 }
 
diff --git a/drivers/acpi/acpica/psopcode.c b/drivers/acpi/acpica/psopcode.c
index ed1d457bd5ca..1793d934aa30 100644
--- a/drivers/acpi/acpica/psopcode.c
+++ b/drivers/acpi/acpica/psopcode.c
@@ -59,7 +59,7 @@ static const u8 acpi_gbl_argument_count[] =
  *
  * DESCRIPTION: Opcode table. Each entry contains <opcode, type, name, operands>
  *              The name is a simple ascii string, the operand specifier is an
- *              ascii string with one letter per operand.  The letter specifies
+ *              ascii string with one letter per operand. The letter specifies
  *              the operand type.
  *
  ******************************************************************************/
@@ -183,7 +183,7 @@ static const u8 acpi_gbl_argument_count[] =
  ******************************************************************************/
 
 /*
- * Master Opcode information table.  A summary of everything we know about each
+ * Master Opcode information table. A summary of everything we know about each
  * opcode, all in one place.
  */
 const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
@@ -392,10 +392,12 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
                  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_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_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),
@@ -495,7 +497,8 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
                  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_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,
@@ -519,12 +522,13 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
 /* 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),
+                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                         AML_FIELD),
 /* 5F */ ACPI_OP("BankField", ARGP_BANK_FIELD_OP, ARGI_BANK_FIELD_OP,
-                 ACPI_TYPE_LOCAL_BANK_FIELD, AML_CLASS_NAMED_OBJECT,
-                 AML_TYPE_NAMED_FIELD,
-                 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE | AML_FIELD |
-                 AML_DEFER),
+                         ACPI_TYPE_LOCAL_BANK_FIELD,
+                         AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_FIELD,
+                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                         AML_FIELD | AML_DEFER),
 
 /* Internal opcodes that map to invalid AML opcodes */
 
@@ -632,7 +636,8 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = {
 /* 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),
+                         AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |
+                         AML_NSNODE),
 
 /* ACPI 3.0 opcodes */
 
@@ -695,7 +700,7 @@ static const u8 acpi_gbl_short_op_index[256] = {
 
 /*
  * This table is indexed by the second opcode of the extended opcode
- * pair.  It returns an index into the opcode table (acpi_gbl_aml_op_info)
+ * pair. It returns an index into the opcode table (acpi_gbl_aml_op_info)
  */
 static const u8 acpi_gbl_long_op_index[NUM_EXTENDED_OPCODE] = {
 /*              0     1     2     3     4     5     6     7  */
diff --git a/drivers/acpi/acpica/psparse.c b/drivers/acpi/acpica/psparse.c
index 01985703bb98..2494caf47755 100644
--- a/drivers/acpi/acpica/psparse.c
+++ b/drivers/acpi/acpica/psparse.c
@@ -43,9 +43,9 @@
 
 /*
  * Parse the AML and build an operation tree as most interpreters,
- * like Perl, do.  Parsing is done by hand rather than with a YACC
+ * like Perl, do. Parsing is done by hand rather than with a YACC
  * generated parser to tightly constrain stack and dynamic memory
- * usage.  At the same time, parsing is kept flexible and the code
+ * usage. At the same time, parsing is kept flexible and the code
  * fairly compact by parsing based on a list of AML opcode
  * templates in aml_op_info[]
  */
@@ -379,7 +379,7 @@ acpi_ps_next_parse_state(struct acpi_walk_state *walk_state,
         case AE_CTRL_FALSE:
                 /*
                  * Either an IF/WHILE Predicate was false or we encountered a BREAK
-                 * opcode.  In both cases, we do not execute the rest of the
+                 * opcode. In both cases, we do not execute the rest of the
                  * package;  We simply close out the parent (finishing the walk of
                  * this branch of the tree) and continue execution at the parent
                  * level.
@@ -459,8 +459,9 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
 
                         /* Executing a control method - additional cleanup */
 
-                        acpi_ds_terminate_control_method(
-                                walk_state->method_desc, walk_state);
+                        acpi_ds_terminate_control_method(walk_state->
+                                                         method_desc,
+                                                         walk_state);
                 }
 
                 acpi_ds_delete_walk_state(walk_state);
@@ -487,7 +488,7 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state)
         acpi_gbl_current_walk_list = thread;
 
         /*
-         * Execute the walk loop as long as there is a valid Walk State.  This
+         * Execute the walk loop as long as there is a valid Walk State. This
          * handles nested control method invocations without recursion.
          */
         ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "State=%p\n", walk_state));
diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c
index 8736ad5f04d3..4137dcb352d1 100644
--- a/drivers/acpi/acpica/psutils.c
+++ b/drivers/acpi/acpica/psutils.c
@@ -108,7 +108,7 @@ void acpi_ps_init_op(union acpi_parse_object *op, u16 opcode)
  * RETURN:      Pointer to the new Op, null on failure
  *
  * DESCRIPTION: Allocate an acpi_op, choose op type (and thus size) based on
- *              opcode.  A cache of opcodes is available for the pure
+ *              opcode. A cache of opcodes is available for the pure
  *              GENERIC_OP, since this is by far the most commonly used.
  *
  ******************************************************************************/
@@ -164,7 +164,7 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode)
  *
  * RETURN:      None.
  *
- * DESCRIPTION: Free an Op object.  Either put it on the GENERIC_OP cache list
+ * DESCRIPTION: Free an Op object. Either put it on the GENERIC_OP cache list
  *              or actually free it.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c
index de12469d1c9c..147feb6aa2a0 100644
--- a/drivers/acpi/acpica/rscalc.c
+++ b/drivers/acpi/acpica/rscalc.c
@@ -457,6 +457,15 @@ acpi_rs_get_list_length(u8 * aml_buffer,
                          * Get the number of vendor data bytes
                          */
                         extra_struct_bytes = resource_length;
+
+                        /*
+                         * There is already one byte included in the minimum
+                         * descriptor size. If there are extra struct bytes,
+                         * subtract one from the count.
+                         */
+                        if (extra_struct_bytes) {
+                                extra_struct_bytes--;
+                        }
                         break;
 
                 case ACPI_RESOURCE_NAME_END_TAG:
@@ -601,7 +610,7 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
         /*
          * Calculate the size of the return buffer.
          * The base size is the number of elements * the sizes of the
-         * structures.  Additional space for the strings is added below.
+         * structures. Additional space for the strings is added below.
          * The minus one is to subtract the size of the u8 Source[1]
          * member because it is added below.
          *
@@ -664,8 +673,7 @@ 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 {
                         /*
diff --git a/drivers/acpi/acpica/rslist.c b/drivers/acpi/acpica/rslist.c
index 46b5324b22d6..8b64db9a3fd2 100644
--- a/drivers/acpi/acpica/rslist.c
+++ b/drivers/acpi/acpica/rslist.c
@@ -109,7 +109,7 @@ acpi_rs_convert_aml_to_resources(u8 * aml,
                 ACPI_ERROR((AE_INFO,
                             "Invalid/unsupported resource descriptor: Type 0x%2.2X",
                             resource_index));
-                return (AE_AML_INVALID_RESOURCE_TYPE);
+                return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
         }
 
         /* Convert the AML byte stream resource to a local resource struct */
@@ -200,7 +200,7 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
                         ACPI_ERROR((AE_INFO,
                                     "Invalid/unsupported resource descriptor: Type 0x%2.2X",
                                     resource->type));
-                        return (AE_AML_INVALID_RESOURCE_TYPE);
+                        return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
                 }
 
                 status = acpi_rs_convert_resource_to_aml(resource,
diff --git a/drivers/acpi/acpica/tbfind.c b/drivers/acpi/acpica/tbfind.c
index 57deae166577..77d1db29a725 100644
--- a/drivers/acpi/acpica/tbfind.c
+++ b/drivers/acpi/acpica/tbfind.c
@@ -77,7 +77,7 @@ acpi_tb_find_table(char *signature,
         /* Normalize the input strings */
 
         ACPI_MEMSET(&header, 0, sizeof(struct acpi_table_header));
-        ACPI_STRNCPY(header.signature, signature, ACPI_NAME_SIZE);
+        ACPI_MOVE_NAME(header.signature, signature);
         ACPI_STRNCPY(header.oem_id, oem_id, ACPI_OEM_ID_SIZE);
         ACPI_STRNCPY(header.oem_table_id, oem_table_id, ACPI_OEM_TABLE_ID_SIZE);
 
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index 70f9d787c82c..f540ae462925 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -526,6 +526,8 @@ void acpi_tb_terminate(void)
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "ACPI Tables freed\n"));
         (void)acpi_ut_release_mutex(ACPI_MTX_TABLES);
+
+        return_VOID;
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
index b6cea30da638..285e24b97382 100644
--- a/drivers/acpi/acpica/tbutils.c
+++ b/drivers/acpi/acpica/tbutils.c
@@ -354,7 +354,7 @@ u8 acpi_tb_checksum(u8 *buffer, u32 length)
                 sum = (u8) (sum + *(buffer++));
         }
 
-        return sum;
+        return (sum);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index 21101262e47a..f5632780421d 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -236,7 +236,7 @@ acpi_get_table_header(char *signature,
                                                        sizeof(struct
                                                               acpi_table_header));
                                 if (!header) {
-                                        return AE_NO_MEMORY;
+                                        return (AE_NO_MEMORY);
                                 }
                                 ACPI_MEMCPY(out_table_header, header,
                                             sizeof(struct acpi_table_header));
@@ -244,7 +244,7 @@ acpi_get_table_header(char *signature,
                                                      sizeof(struct
                                                             acpi_table_header));
                         } else {
-                                return AE_NOT_FOUND;
+                                return (AE_NOT_FOUND);
                         }
                 } else {
                         ACPI_MEMCPY(out_table_header,
diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c
index f87cc63e69a1..a5e1e4e47098 100644
--- a/drivers/acpi/acpica/tbxfload.c
+++ b/drivers/acpi/acpica/tbxfload.c
@@ -211,7 +211,7 @@ static acpi_status acpi_tb_load_namespace(void)
  * DESCRIPTION: Dynamically load an ACPI table from the caller's buffer. Must
  *              be a valid ACPI table with a valid ACPI table header.
  *              Note1: Mainly intended to support hotplug addition of SSDTs.
- *              Note2: Does not copy the incoming table. User is reponsible
+ *              Note2: Does not copy the incoming table. User is responsible
  *              to ensure that the table is not deleted or unmapped.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/tbxfroot.c b/drivers/acpi/acpica/tbxfroot.c
index 74e720800037..28f330230f99 100644
--- a/drivers/acpi/acpica/tbxfroot.c
+++ b/drivers/acpi/acpica/tbxfroot.c
@@ -67,7 +67,6 @@ static acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp);
 
 static acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp)
 {
-        ACPI_FUNCTION_ENTRY();
 
         /*
          * The signature and checksum must both be correct
@@ -108,7 +107,7 @@ static acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp)
  * RETURN:      Status, RSDP physical address
  *
  * DESCRIPTION: Search lower 1Mbyte of memory for the root system descriptor
- *              pointer structure.  If it is found, set *RSDP to point to it.
+ *              pointer structure. If it is found, set *RSDP to point to it.
  *
  * NOTE1:       The RSDP must be either in the first 1K of the Extended
  *              BIOS Data Area or between E0000 and FFFFF (From ACPI Spec.)
diff --git a/drivers/acpi/acpica/utcache.c b/drivers/acpi/acpica/utcache.c
new file mode 100644
index 000000000000..e1d40ed26390
--- /dev/null
+++ b/drivers/acpi/acpica/utcache.c
@@ -0,0 +1,323 @@
+/******************************************************************************
+ *
+ * Module Name: utcache - local cache allocation routines
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2012, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+
+#define _COMPONENT          ACPI_UTILITIES
+ACPI_MODULE_NAME("utcache")
+
+#ifdef ACPI_USE_LOCAL_CACHE
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_os_create_cache
+ *
+ * PARAMETERS:  cache_name      - Ascii name for the cache
+ *              object_size     - Size of each cached object
+ *              max_depth       - Maximum depth of the cache (in objects)
+ *              return_cache    - Where the new cache object is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Create a cache object
+ *
+ ******************************************************************************/
+acpi_status
+acpi_os_create_cache(char *cache_name,
+                     u16 object_size,
+                     u16 max_depth, struct acpi_memory_list ** return_cache)
+{
+        struct acpi_memory_list *cache;
+
+        ACPI_FUNCTION_ENTRY();
+
+        if (!cache_name || !return_cache || (object_size < 16)) {
+                return (AE_BAD_PARAMETER);
+        }
+
+        /* Create the cache object */
+
+        cache = acpi_os_allocate(sizeof(struct acpi_memory_list));
+        if (!cache) {
+                return (AE_NO_MEMORY);
+        }
+
+        /* Populate the cache object and return it */
+
+        ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list));
+        cache->link_offset = 8;
+        cache->list_name = cache_name;
+        cache->object_size = object_size;
+        cache->max_depth = max_depth;
+
+        *return_cache = cache;
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_os_purge_cache
+ *
+ * PARAMETERS:  cache           - Handle to cache object
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Free all objects within the requested cache.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache)
+{
+        char *next;
+        acpi_status status;
+
+        ACPI_FUNCTION_ENTRY();
+
+        if (!cache) {
+                return (AE_BAD_PARAMETER);
+        }
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* Walk the list of objects in this cache */
+
+        while (cache->list_head) {
+
+                /* Delete and unlink one cached state object */
+
+                next = *(ACPI_CAST_INDIRECT_PTR(char,
+                                                &(((char *)cache->
+                                                   list_head)[cache->
+                                                              link_offset])));
+                ACPI_FREE(cache->list_head);
+
+                cache->list_head = next;
+                cache->current_depth--;
+        }
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_CACHES);
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_os_delete_cache
+ *
+ * PARAMETERS:  cache           - Handle to cache object
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Free all objects within the requested cache and delete the
+ *              cache object.
+ *
+ ******************************************************************************/
+
+acpi_status acpi_os_delete_cache(struct acpi_memory_list * cache)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_ENTRY();
+
+        /* Purge all objects in the cache */
+
+        status = acpi_os_purge_cache(cache);
+        if (ACPI_FAILURE(status)) {
+                return (status);
+        }
+
+        /* Now we can delete the cache object */
+
+        acpi_os_free(cache);
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_os_release_object
+ *
+ * PARAMETERS:  cache       - Handle to cache object
+ *              object      - The object to be released
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Release an object to the specified cache. If cache is full,
+ *              the object is deleted.
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_os_release_object(struct acpi_memory_list * cache, void *object)
+{
+        acpi_status status;
+
+        ACPI_FUNCTION_ENTRY();
+
+        if (!cache || !object) {
+                return (AE_BAD_PARAMETER);
+        }
+
+        /* If cache is full, just free this object */
+
+        if (cache->current_depth >= cache->max_depth) {
+                ACPI_FREE(object);
+                ACPI_MEM_TRACKING(cache->total_freed++);
+        }
+
+        /* Otherwise put this object back into the cache */
+
+        else {
+                status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
+
+                /* Mark the object as cached */
+
+                ACPI_MEMSET(object, 0xCA, cache->object_size);
+                ACPI_SET_DESCRIPTOR_TYPE(object, ACPI_DESC_TYPE_CACHED);
+
+                /* Put the object at the head of the cache list */
+
+                *(ACPI_CAST_INDIRECT_PTR(char,
+                                         &(((char *)object)[cache->
+                                                            link_offset]))) =
+                    cache->list_head;
+                cache->list_head = object;
+                cache->current_depth++;
+
+                (void)acpi_ut_release_mutex(ACPI_MTX_CACHES);
+        }
+
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_os_acquire_object
+ *
+ * PARAMETERS:  cache           - Handle to cache object
+ *
+ * RETURN:      the acquired object. NULL on error
+ *
+ * DESCRIPTION: Get an object from the specified cache. If cache is empty,
+ *              the object is allocated.
+ *
+ ******************************************************************************/
+
+void *acpi_os_acquire_object(struct acpi_memory_list *cache)
+{
+        acpi_status status;
+        void *object;
+
+        ACPI_FUNCTION_NAME(os_acquire_object);
+
+        if (!cache) {
+                return (NULL);
+        }
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);
+        if (ACPI_FAILURE(status)) {
+                return (NULL);
+        }
+
+        ACPI_MEM_TRACKING(cache->requests++);
+
+        /* Check the cache first */
+
+        if (cache->list_head) {
+
+                /* There is an object available, use it */
+
+                object = cache->list_head;
+                cache->list_head = *(ACPI_CAST_INDIRECT_PTR(char,
+                                                            &(((char *)
+                                                               object)[cache->
+                                                                       link_offset])));
+
+                cache->current_depth--;
+
+                ACPI_MEM_TRACKING(cache->hits++);
+                ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                                  "Object %p from %s cache\n", object,
+                                  cache->list_name));
+
+                status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
+                if (ACPI_FAILURE(status)) {
+                        return (NULL);
+                }
+
+                /* Clear (zero) the previously used Object */
+
+                ACPI_MEMSET(object, 0, cache->object_size);
+        } else {
+                /* The cache is empty, create a new object */
+
+                ACPI_MEM_TRACKING(cache->total_allocated++);
+
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+                if ((cache->total_allocated - cache->total_freed) >
+                    cache->max_occupied) {
+                        cache->max_occupied =
+                            cache->total_allocated - cache->total_freed;
+                }
+#endif
+
+                /* Avoid deadlock with ACPI_ALLOCATE_ZEROED */
+
+                status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
+                if (ACPI_FAILURE(status)) {
+                        return (NULL);
+                }
+
+                object = ACPI_ALLOCATE_ZEROED(cache->object_size);
+                if (!object) {
+                        return (NULL);
+                }
+        }
+
+        return (object);
+}
+#endif                          /* ACPI_USE_LOCAL_CACHE */
diff --git a/drivers/acpi/acpica/utclib.c b/drivers/acpi/acpica/utclib.c
new file mode 100644
index 000000000000..19ea4755aa73
--- /dev/null
+++ b/drivers/acpi/acpica/utclib.c
@@ -0,0 +1,749 @@
+/******************************************************************************
+ *
+ * Module Name: cmclib - Local implementation of C library functions
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2012, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+
+/*
+ * These implementations of standard C Library routines can optionally be
+ * used if a C library is not available. In general, they are less efficient
+ * than an inline or assembly implementation
+ */
+
+#define _COMPONENT          ACPI_UTILITIES
+ACPI_MODULE_NAME("cmclib")
+
+#ifndef ACPI_USE_SYSTEM_CLIBRARY
+#define NEGATIVE    1
+#define POSITIVE    0
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_memcmp (memcmp)
+ *
+ * PARAMETERS:  buffer1         - First Buffer
+ *              buffer2         - Second Buffer
+ *              count           - Maximum # of bytes to compare
+ *
+ * RETURN:      Index where Buffers mismatched, or 0 if Buffers matched
+ *
+ * DESCRIPTION: Compare two Buffers, with a maximum length
+ *
+ ******************************************************************************/
+int acpi_ut_memcmp(const char *buffer1, const char *buffer2, acpi_size count)
+{
+
+        return ((count == ACPI_SIZE_MAX) ? 0 : ((unsigned char)*buffer1 -
+                                                (unsigned char)*buffer2));
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_memcpy (memcpy)
+ *
+ * PARAMETERS:  dest        - Target of the copy
+ *              src         - Source buffer to copy
+ *              count       - Number of bytes to copy
+ *
+ * RETURN:      Dest
+ *
+ * DESCRIPTION: Copy arbitrary bytes of memory
+ *
+ ******************************************************************************/
+
+void *acpi_ut_memcpy(void *dest, const void *src, acpi_size count)
+{
+        char *new = (char *)dest;
+        char *old = (char *)src;
+
+        while (count) {
+                *new = *old;
+                new++;
+                old++;
+                count--;
+        }
+
+        return (dest);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_memset (memset)
+ *
+ * PARAMETERS:  dest        - Buffer to set
+ *              value       - Value to set each byte of memory
+ *              count       - Number of bytes to set
+ *
+ * RETURN:      Dest
+ *
+ * DESCRIPTION: Initialize a buffer to a known value.
+ *
+ ******************************************************************************/
+
+void *acpi_ut_memset(void *dest, u8 value, acpi_size count)
+{
+        char *new = (char *)dest;
+
+        while (count) {
+                *new = (char)value;
+                new++;
+                count--;
+        }
+
+        return (dest);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_strlen (strlen)
+ *
+ * PARAMETERS:  string              - Null terminated string
+ *
+ * RETURN:      Length
+ *
+ * DESCRIPTION: Returns the length of the input string
+ *
+ ******************************************************************************/
+
+acpi_size acpi_ut_strlen(const char *string)
+{
+        u32 length = 0;
+
+        /* Count the string until a null is encountered */
+
+        while (*string) {
+                length++;
+                string++;
+        }
+
+        return (length);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_strcpy (strcpy)
+ *
+ * PARAMETERS:  dst_string      - Target of the copy
+ *              src_string      - The source string to copy
+ *
+ * RETURN:      dst_string
+ *
+ * DESCRIPTION: Copy a null terminated string
+ *
+ ******************************************************************************/
+
+char *acpi_ut_strcpy(char *dst_string, const char *src_string)
+{
+        char *string = dst_string;
+
+        /* Move bytes brute force */
+
+        while (*src_string) {
+                *string = *src_string;
+
+                string++;
+                src_string++;
+        }
+
+        /* Null terminate */
+
+        *string = 0;
+        return (dst_string);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_strncpy (strncpy)
+ *
+ * PARAMETERS:  dst_string      - Target of the copy
+ *              src_string      - The source string to copy
+ *              count           - Maximum # of bytes to copy
+ *
+ * RETURN:      dst_string
+ *
+ * DESCRIPTION: Copy a null terminated string, with a maximum length
+ *
+ ******************************************************************************/
+
+char *acpi_ut_strncpy(char *dst_string, const char *src_string, acpi_size count)
+{
+        char *string = dst_string;
+
+        /* Copy the string */
+
+        for (string = dst_string;
+             count && (count--, (*string++ = *src_string++));) {;
+        }
+
+        /* Pad with nulls if necessary */
+
+        while (count--) {
+                *string = 0;
+                string++;
+        }
+
+        /* Return original pointer */
+
+        return (dst_string);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_strcmp (strcmp)
+ *
+ * PARAMETERS:  string1         - First string
+ *              string2         - Second string
+ *
+ * RETURN:      Index where strings mismatched, or 0 if strings matched
+ *
+ * DESCRIPTION: Compare two null terminated strings
+ *
+ ******************************************************************************/
+
+int acpi_ut_strcmp(const char *string1, const char *string2)
+{
+
+        for (; (*string1 == *string2); string2++) {
+                if (!*string1++) {
+                        return (0);
+                }
+        }
+
+        return ((unsigned char)*string1 - (unsigned char)*string2);
+}
+
+#ifdef ACPI_FUTURE_IMPLEMENTATION
+/* Not used at this time */
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_strchr (strchr)
+ *
+ * PARAMETERS:  string          - Search string
+ *              ch              - character to search for
+ *
+ * RETURN:      Ptr to char or NULL if not found
+ *
+ * DESCRIPTION: Search a string for a character
+ *
+ ******************************************************************************/
+
+char *acpi_ut_strchr(const char *string, int ch)
+{
+
+        for (; (*string); string++) {
+                if ((*string) == (char)ch) {
+                        return ((char *)string);
+                }
+        }
+
+        return (NULL);
+}
+#endif
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_strncmp (strncmp)
+ *
+ * PARAMETERS:  string1         - First string
+ *              string2         - Second string
+ *              count           - Maximum # of bytes to compare
+ *
+ * RETURN:      Index where strings mismatched, or 0 if strings matched
+ *
+ * DESCRIPTION: Compare two null terminated strings, with a maximum length
+ *
+ ******************************************************************************/
+
+int acpi_ut_strncmp(const char *string1, const char *string2, acpi_size count)
+{
+
+        for (; count-- && (*string1 == *string2); string2++) {
+                if (!*string1++) {
+                        return (0);
+                }
+        }
+
+        return ((count == ACPI_SIZE_MAX) ? 0 : ((unsigned char)*string1 -
+                                                (unsigned char)*string2));
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_strcat (Strcat)
+ *
+ * PARAMETERS:  dst_string      - Target of the copy
+ *              src_string      - The source string to copy
+ *
+ * RETURN:      dst_string
+ *
+ * DESCRIPTION: Append a null terminated string to a null terminated string
+ *
+ ******************************************************************************/
+
+char *acpi_ut_strcat(char *dst_string, const char *src_string)
+{
+        char *string;
+
+        /* Find end of the destination string */
+
+        for (string = dst_string; *string++;) {;
+        }
+
+        /* Concatenate the string */
+
+        for (--string; (*string++ = *src_string++);) {;
+        }
+
+        return (dst_string);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_strncat (strncat)
+ *
+ * PARAMETERS:  dst_string      - Target of the copy
+ *              src_string      - The source string to copy
+ *              count           - Maximum # of bytes to copy
+ *
+ * RETURN:      dst_string
+ *
+ * DESCRIPTION: Append a null terminated string to a null terminated string,
+ *              with a maximum count.
+ *
+ ******************************************************************************/
+
+char *acpi_ut_strncat(char *dst_string, const char *src_string, acpi_size count)
+{
+        char *string;
+
+        if (count) {
+
+                /* Find end of the destination string */
+
+                for (string = dst_string; *string++;) {;
+                }
+
+                /* Concatenate the string */
+
+                for (--string; (*string++ = *src_string++) && --count;) {;
+                }
+
+                /* Null terminate if necessary */
+
+                if (!count) {
+                        *string = 0;
+                }
+        }
+
+        return (dst_string);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_strstr (strstr)
+ *
+ * PARAMETERS:  string1         - Target string
+ *              string2         - Substring to search for
+ *
+ * RETURN:      Where substring match starts, Null if no match found
+ *
+ * DESCRIPTION: Checks if String2 occurs in String1. This is not really a
+ *              full implementation of strstr, only sufficient for command
+ *              matching
+ *
+ ******************************************************************************/
+
+char *acpi_ut_strstr(char *string1, char *string2)
+{
+        char *string;
+
+        if (acpi_ut_strlen(string2) > acpi_ut_strlen(string1)) {
+                return (NULL);
+        }
+
+        /* Walk entire string, comparing the letters */
+
+        for (string = string1; *string2;) {
+                if (*string2 != *string) {
+                        return (NULL);
+                }
+
+                string2++;
+                string++;
+        }
+
+        return (string1);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_strtoul (strtoul)
+ *
+ * PARAMETERS:  string          - Null terminated string
+ *              terminater      - Where a pointer to the terminating byte is
+ *                                returned
+ *              base            - Radix of the string
+ *
+ * RETURN:      Converted value
+ *
+ * DESCRIPTION: Convert a string into a 32-bit unsigned value.
+ *              Note: use acpi_ut_strtoul64 for 64-bit integers.
+ *
+ ******************************************************************************/
+
+u32 acpi_ut_strtoul(const char *string, char **terminator, u32 base)
+{
+        u32 converted = 0;
+        u32 index;
+        u32 sign;
+        const char *string_start;
+        u32 return_value = 0;
+        acpi_status status = AE_OK;
+
+        /*
+         * Save the value of the pointer to the buffer's first
+         * character, save the current errno value, and then
+         * skip over any white space in the buffer:
+         */
+        string_start = string;
+        while (ACPI_IS_SPACE(*string) || *string == '\t') {
+                ++string;
+        }
+
+        /*
+         * The buffer may contain an optional plus or minus sign.
+         * If it does, then skip over it but remember what is was:
+         */
+        if (*string == '-') {
+                sign = NEGATIVE;
+                ++string;
+        } else if (*string == '+') {
+                ++string;
+                sign = POSITIVE;
+        } else {
+                sign = POSITIVE;
+        }
+
+        /*
+         * If the input parameter Base is zero, then we need to
+         * determine if it is octal, decimal, or hexadecimal:
+         */
+        if (base == 0) {
+                if (*string == '0') {
+                        if (acpi_ut_to_lower(*(++string)) == 'x') {
+                                base = 16;
+                                ++string;
+                        } else {
+                                base = 8;
+                        }
+                } else {
+                        base = 10;
+                }
+        } else if (base < 2 || base > 36) {
+                /*
+                 * The specified Base parameter is not in the domain of
+                 * this function:
+                 */
+                goto done;
+        }
+
+        /*
+         * For octal and hexadecimal bases, skip over the leading
+         * 0 or 0x, if they are present.
+         */
+        if (base == 8 && *string == '0') {
+                string++;
+        }
+
+        if (base == 16 &&
+            *string == '0' && acpi_ut_to_lower(*(++string)) == 'x') {
+                string++;
+        }
+
+        /*
+         * Main loop: convert the string to an unsigned long:
+         */
+        while (*string) {
+                if (ACPI_IS_DIGIT(*string)) {
+                        index = (u32)((u8)*string - '0');
+                } else {
+                        index = (u32)acpi_ut_to_upper(*string);
+                        if (ACPI_IS_UPPER(index)) {
+                                index = index - 'A' + 10;
+                        } else {
+                                goto done;
+                        }
+                }
+
+                if (index >= base) {
+                        goto done;
+                }
+
+                /*
+                 * Check to see if value is out of range:
+                 */
+
+                if (return_value > ((ACPI_UINT32_MAX - (u32)index) / (u32)base)) {
+                        status = AE_ERROR;
+                        return_value = 0;       /* reset */
+                } else {
+                        return_value *= base;
+                        return_value += index;
+                        converted = 1;
+                }
+
+                ++string;
+        }
+
+      done:
+        /*
+         * If appropriate, update the caller's pointer to the next
+         * unconverted character in the buffer.
+         */
+        if (terminator) {
+                if (converted == 0 && return_value == 0 && string != NULL) {
+                        *terminator = (char *)string_start;
+                } else {
+                        *terminator = (char *)string;
+                }
+        }
+
+        if (status == AE_ERROR) {
+                return_value = ACPI_UINT32_MAX;
+        }
+
+        /*
+         * If a minus sign was present, then "the conversion is negated":
+         */
+        if (sign == NEGATIVE) {
+                return_value = (ACPI_UINT32_MAX - return_value) + 1;
+        }
+
+        return (return_value);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_to_upper (TOUPPER)
+ *
+ * PARAMETERS:  c           - Character to convert
+ *
+ * RETURN:      Converted character as an int
+ *
+ * DESCRIPTION: Convert character to uppercase
+ *
+ ******************************************************************************/
+
+int acpi_ut_to_upper(int c)
+{
+
+        return (ACPI_IS_LOWER(c) ? ((c) - 0x20) : (c));
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_to_lower (TOLOWER)
+ *
+ * PARAMETERS:  c           - Character to convert
+ *
+ * RETURN:      Converted character as an int
+ *
+ * DESCRIPTION: Convert character to lowercase
+ *
+ ******************************************************************************/
+
+int acpi_ut_to_lower(int c)
+{
+
+        return (ACPI_IS_UPPER(c) ? ((c) + 0x20) : (c));
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    is* functions
+ *
+ * DESCRIPTION: is* functions use the ctype table below
+ *
+ ******************************************************************************/
+
+const u8 _acpi_ctype[257] = {
+        _ACPI_CN,               /* 0x00     0 NUL */
+        _ACPI_CN,               /* 0x01     1 SOH */
+        _ACPI_CN,               /* 0x02     2 STX */
+        _ACPI_CN,               /* 0x03     3 ETX */
+        _ACPI_CN,               /* 0x04     4 EOT */
+        _ACPI_CN,               /* 0x05     5 ENQ */
+        _ACPI_CN,               /* 0x06     6 ACK */
+        _ACPI_CN,               /* 0x07     7 BEL */
+        _ACPI_CN,               /* 0x08     8 BS  */
+        _ACPI_CN | _ACPI_SP,    /* 0x09     9 TAB */
+        _ACPI_CN | _ACPI_SP,    /* 0x0A    10 LF  */
+        _ACPI_CN | _ACPI_SP,    /* 0x0B    11 VT  */
+        _ACPI_CN | _ACPI_SP,    /* 0x0C    12 FF  */
+        _ACPI_CN | _ACPI_SP,    /* 0x0D    13 CR  */
+        _ACPI_CN,               /* 0x0E    14 SO  */
+        _ACPI_CN,               /* 0x0F    15 SI  */
+        _ACPI_CN,               /* 0x10    16 DLE */
+        _ACPI_CN,               /* 0x11    17 DC1 */
+        _ACPI_CN,               /* 0x12    18 DC2 */
+        _ACPI_CN,               /* 0x13    19 DC3 */
+        _ACPI_CN,               /* 0x14    20 DC4 */
+        _ACPI_CN,               /* 0x15    21 NAK */
+        _ACPI_CN,               /* 0x16    22 SYN */
+        _ACPI_CN,               /* 0x17    23 ETB */
+        _ACPI_CN,               /* 0x18    24 CAN */
+        _ACPI_CN,               /* 0x19    25 EM  */
+        _ACPI_CN,               /* 0x1A    26 SUB */
+        _ACPI_CN,               /* 0x1B    27 ESC */
+        _ACPI_CN,               /* 0x1C    28 FS  */
+        _ACPI_CN,               /* 0x1D    29 GS  */
+        _ACPI_CN,               /* 0x1E    30 RS  */
+        _ACPI_CN,               /* 0x1F    31 US  */
+        _ACPI_XS | _ACPI_SP,    /* 0x20    32 ' ' */
+        _ACPI_PU,               /* 0x21    33 '!' */
+        _ACPI_PU,               /* 0x22    34 '"' */
+        _ACPI_PU,               /* 0x23    35 '#' */
+        _ACPI_PU,               /* 0x24    36 '$' */
+        _ACPI_PU,               /* 0x25    37 '%' */
+        _ACPI_PU,               /* 0x26    38 '&' */
+        _ACPI_PU,               /* 0x27    39 ''' */
+        _ACPI_PU,               /* 0x28    40 '(' */
+        _ACPI_PU,               /* 0x29    41 ')' */
+        _ACPI_PU,               /* 0x2A    42 '*' */
+        _ACPI_PU,               /* 0x2B    43 '+' */
+        _ACPI_PU,               /* 0x2C    44 ',' */
+        _ACPI_PU,               /* 0x2D    45 '-' */
+        _ACPI_PU,               /* 0x2E    46 '.' */
+        _ACPI_PU,               /* 0x2F    47 '/' */
+        _ACPI_XD | _ACPI_DI,    /* 0x30    48 '0' */
+        _ACPI_XD | _ACPI_DI,    /* 0x31    49 '1' */
+        _ACPI_XD | _ACPI_DI,    /* 0x32    50 '2' */
+        _ACPI_XD | _ACPI_DI,    /* 0x33    51 '3' */
+        _ACPI_XD | _ACPI_DI,    /* 0x34    52 '4' */
+        _ACPI_XD | _ACPI_DI,    /* 0x35    53 '5' */
+        _ACPI_XD | _ACPI_DI,    /* 0x36    54 '6' */
+        _ACPI_XD | _ACPI_DI,    /* 0x37    55 '7' */
+        _ACPI_XD | _ACPI_DI,    /* 0x38    56 '8' */
+        _ACPI_XD | _ACPI_DI,    /* 0x39    57 '9' */
+        _ACPI_PU,               /* 0x3A    58 ':' */
+        _ACPI_PU,               /* 0x3B    59 ';' */
+        _ACPI_PU,               /* 0x3C    60 '<' */
+        _ACPI_PU,               /* 0x3D    61 '=' */
+        _ACPI_PU,               /* 0x3E    62 '>' */
+        _ACPI_PU,               /* 0x3F    63 '?' */
+        _ACPI_PU,               /* 0x40    64 '@' */
+        _ACPI_XD | _ACPI_UP,    /* 0x41    65 'A' */
+        _ACPI_XD | _ACPI_UP,    /* 0x42    66 'B' */
+        _ACPI_XD | _ACPI_UP,    /* 0x43    67 'C' */
+        _ACPI_XD | _ACPI_UP,    /* 0x44    68 'D' */
+        _ACPI_XD | _ACPI_UP,    /* 0x45    69 'E' */
+        _ACPI_XD | _ACPI_UP,    /* 0x46    70 'F' */
+        _ACPI_UP,               /* 0x47    71 'G' */
+        _ACPI_UP,               /* 0x48    72 'H' */
+        _ACPI_UP,               /* 0x49    73 'I' */
+        _ACPI_UP,               /* 0x4A    74 'J' */
+        _ACPI_UP,               /* 0x4B    75 'K' */
+        _ACPI_UP,               /* 0x4C    76 'L' */
+        _ACPI_UP,               /* 0x4D    77 'M' */
+        _ACPI_UP,               /* 0x4E    78 'N' */
+        _ACPI_UP,               /* 0x4F    79 'O' */
+        _ACPI_UP,               /* 0x50    80 'P' */
+        _ACPI_UP,               /* 0x51    81 'Q' */
+        _ACPI_UP,               /* 0x52    82 'R' */
+        _ACPI_UP,               /* 0x53    83 'S' */
+        _ACPI_UP,               /* 0x54    84 'T' */
+        _ACPI_UP,               /* 0x55    85 'U' */
+        _ACPI_UP,               /* 0x56    86 'V' */
+        _ACPI_UP,               /* 0x57    87 'W' */
+        _ACPI_UP,               /* 0x58    88 'X' */
+        _ACPI_UP,               /* 0x59    89 'Y' */
+        _ACPI_UP,               /* 0x5A    90 'Z' */
+        _ACPI_PU,               /* 0x5B    91 '[' */
+        _ACPI_PU,               /* 0x5C    92 '\' */
+        _ACPI_PU,               /* 0x5D    93 ']' */
+        _ACPI_PU,               /* 0x5E    94 '^' */
+        _ACPI_PU,               /* 0x5F    95 '_' */
+        _ACPI_PU,               /* 0x60    96 '`' */
+        _ACPI_XD | _ACPI_LO,    /* 0x61    97 'a' */
+        _ACPI_XD | _ACPI_LO,    /* 0x62    98 'b' */
+        _ACPI_XD | _ACPI_LO,    /* 0x63    99 'c' */
+        _ACPI_XD | _ACPI_LO,    /* 0x64   100 'd' */
+        _ACPI_XD | _ACPI_LO,    /* 0x65   101 'e' */
+        _ACPI_XD | _ACPI_LO,    /* 0x66   102 'f' */
+        _ACPI_LO,               /* 0x67   103 'g' */
+        _ACPI_LO,               /* 0x68   104 'h' */
+        _ACPI_LO,               /* 0x69   105 'i' */
+        _ACPI_LO,               /* 0x6A   106 'j' */
+        _ACPI_LO,               /* 0x6B   107 'k' */
+        _ACPI_LO,               /* 0x6C   108 'l' */
+        _ACPI_LO,               /* 0x6D   109 'm' */
+        _ACPI_LO,               /* 0x6E   110 'n' */
+        _ACPI_LO,               /* 0x6F   111 'o' */
+        _ACPI_LO,               /* 0x70   112 'p' */
+        _ACPI_LO,               /* 0x71   113 'q' */
+        _ACPI_LO,               /* 0x72   114 'r' */
+        _ACPI_LO,               /* 0x73   115 's' */
+        _ACPI_LO,               /* 0x74   116 't' */
+        _ACPI_LO,               /* 0x75   117 'u' */
+        _ACPI_LO,               /* 0x76   118 'v' */
+        _ACPI_LO,               /* 0x77   119 'w' */
+        _ACPI_LO,               /* 0x78   120 'x' */
+        _ACPI_LO,               /* 0x79   121 'y' */
+        _ACPI_LO,               /* 0x7A   122 'z' */
+        _ACPI_PU,               /* 0x7B   123 '{' */
+        _ACPI_PU,               /* 0x7C   124 '|' */
+        _ACPI_PU,               /* 0x7D   125 '}' */
+        _ACPI_PU,               /* 0x7E   126 '~' */
+        _ACPI_CN,               /* 0x7F   127 DEL */
+
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x80 to 0x8F    */
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x90 to 0x9F    */
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xA0 to 0xAF    */
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xB0 to 0xBF    */
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xC0 to 0xCF    */
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xD0 to 0xDF    */
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xE0 to 0xEF    */
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xF0 to 0xFF    */
+        0                       /* 0x100 */
+};
+
+#endif                          /* ACPI_USE_SYSTEM_CLIBRARY */
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index e810894149ae..5d95166245ae 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -47,8 +47,9 @@
 
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utdebug")
+
 #ifdef ACPI_DEBUG_OUTPUT
-static acpi_thread_id acpi_gbl_prev_thread_id;
+static acpi_thread_id acpi_gbl_prev_thread_id = (acpi_thread_id) 0xFFFFFFFF;
 static char *acpi_gbl_fn_entry_str = "----Entry";
 static char *acpi_gbl_fn_exit_str = "----Exit-";
 
@@ -109,7 +110,7 @@ void acpi_ut_track_stack_ptr(void)
  * RETURN:      Updated pointer to the function name
  *
  * DESCRIPTION: Remove the "Acpi" prefix from the function name, if present.
- *              This allows compiler macros such as __func__ to be used
+ *              This allows compiler macros such as __FUNCTION__ to be used
  *              with no change to the debug output.
  *
  ******************************************************************************/
@@ -222,7 +223,7 @@ ACPI_EXPORT_SYMBOL(acpi_debug_print)
  *
  * RETURN:      None
  *
- * DESCRIPTION: Print message with no headers.  Has same interface as
+ * DESCRIPTION: Print message with no headers. Has same interface as
  *              debug_print so that the same macros can be used.
  *
  ******************************************************************************/
@@ -258,7 +259,7 @@ ACPI_EXPORT_SYMBOL(acpi_debug_print_raw)
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function entry trace.  Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level
  *
  ******************************************************************************/
@@ -290,7 +291,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_trace)
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function entry trace.  Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level
  *
  ******************************************************************************/
@@ -299,6 +300,7 @@ acpi_ut_trace_ptr(u32 line_number,
                   const char *function_name,
                   const char *module_name, u32 component_id, void *pointer)
 {
+
         acpi_gbl_nesting_level++;
         acpi_ut_track_stack_ptr();
 
@@ -319,7 +321,7 @@ acpi_ut_trace_ptr(u32 line_number,
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function entry trace.  Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level
  *
  ******************************************************************************/
@@ -350,7 +352,7 @@ acpi_ut_trace_str(u32 line_number,
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function entry trace.  Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level
  *
  ******************************************************************************/
@@ -380,7 +382,7 @@ acpi_ut_trace_u32(u32 line_number,
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function exit trace.  Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level
  *
  ******************************************************************************/
@@ -412,7 +414,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_exit)
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function exit trace.  Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level. Prints exit status also.
  *
  ******************************************************************************/
@@ -453,7 +455,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_status_exit)
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function exit trace.  Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level. Prints exit value also.
  *
  ******************************************************************************/
@@ -485,7 +487,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_value_exit)
  *
  * RETURN:      None
  *
- * DESCRIPTION: Function exit trace.  Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
  *              set in debug_level. Prints exit value also.
  *
  ******************************************************************************/
@@ -511,7 +513,7 @@ acpi_ut_ptr_exit(u32 line_number,
  * PARAMETERS:  buffer              - Buffer to dump
  *              count               - Amount to dump, in bytes
  *              display             - BYTE, WORD, DWORD, or QWORD display
- *              component_ID        - Caller's component ID
+ *              offset              - Beginning buffer offset (display only)
  *
  * RETURN:      None
  *
@@ -519,7 +521,7 @@ acpi_ut_ptr_exit(u32 line_number,
  *
  ******************************************************************************/
 
-void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)
+void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
 {
         u32 i = 0;
         u32 j;
@@ -541,7 +543,7 @@ void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)
 
                 /* Print current offset */
 
-                acpi_os_printf("%6.4X: ", i);
+                acpi_os_printf("%6.4X: ", (base_offset + i));
 
                 /* Print 16 hex chars */
 
@@ -623,7 +625,7 @@ void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ut_dump_buffer
+ * FUNCTION:    acpi_ut_debug_dump_buffer
  *
  * PARAMETERS:  buffer              - Buffer to dump
  *              count               - Amount to dump, in bytes
@@ -636,7 +638,8 @@ void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)
  *
  ******************************************************************************/
 
-void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id)
+void
+acpi_ut_debug_dump_buffer(u8 *buffer, u32 count, u32 display, u32 component_id)
 {
 
         /* Only dump the buffer if tracing is enabled */
@@ -646,5 +649,5 @@ void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id)
                 return;
         }
 
-        acpi_ut_dump_buffer2(buffer, count, display);
+        acpi_ut_dump_buffer(buffer, count, display, 0);
 }
diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c
index 5d84e1954575..774c3aefbf5d 100644
--- a/drivers/acpi/acpica/utids.c
+++ b/drivers/acpi/acpica/utids.c
@@ -67,10 +67,10 @@ ACPI_MODULE_NAME("utids")
  ******************************************************************************/
 acpi_status
 acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
-                    struct acpica_device_id **return_id)
+                    struct acpi_pnp_device_id **return_id)
 {
         union acpi_operand_object *obj_desc;
-        struct acpica_device_id *hid;
+        struct acpi_pnp_device_id *hid;
         u32 length;
         acpi_status status;
 
@@ -94,16 +94,17 @@ acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
         /* Allocate a buffer for the HID */
 
         hid =
-            ACPI_ALLOCATE_ZEROED(sizeof(struct acpica_device_id) +
+            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
                                  (acpi_size) length);
         if (!hid) {
                 status = AE_NO_MEMORY;
                 goto cleanup;
         }
 
-        /* Area for the string starts after DEVICE_ID struct */
+        /* Area for the string starts after PNP_DEVICE_ID struct */
 
-        hid->string = ACPI_ADD_PTR(char, hid, sizeof(struct acpica_device_id));
+        hid->string =
+            ACPI_ADD_PTR(char, hid, sizeof(struct acpi_pnp_device_id));
 
         /* Convert EISAID to a string or simply copy existing string */
 
@@ -126,6 +127,73 @@ cleanup:
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_ut_execute_SUB
+ *
+ * PARAMETERS:  device_node         - Node for the device
+ *              return_id           - Where the _SUB is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Executes the _SUB control method that returns the subsystem
+ *              ID of the device. The _SUB value is always a string containing
+ *              either a valid PNP or ACPI ID.
+ *
+ *              NOTE: Internal function, no parameter validation
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_execute_SUB(struct acpi_namespace_node *device_node,
+                    struct acpi_pnp_device_id **return_id)
+{
+        union acpi_operand_object *obj_desc;
+        struct acpi_pnp_device_id *sub;
+        u32 length;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(ut_execute_SUB);
+
+        status = acpi_ut_evaluate_object(device_node, METHOD_NAME__SUB,
+                                         ACPI_BTYPE_STRING, &obj_desc);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Get the size of the String to be returned, includes null terminator */
+
+        length = obj_desc->string.length + 1;
+
+        /* Allocate a buffer for the SUB */
+
+        sub =
+            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
+                                 (acpi_size) length);
+        if (!sub) {
+                status = AE_NO_MEMORY;
+                goto cleanup;
+        }
+
+        /* Area for the string starts after PNP_DEVICE_ID struct */
+
+        sub->string =
+            ACPI_ADD_PTR(char, sub, sizeof(struct acpi_pnp_device_id));
+
+        /* Simply copy existing string */
+
+        ACPI_STRCPY(sub->string, obj_desc->string.pointer);
+        sub->length = length;
+        *return_id = sub;
+
+      cleanup:
+
+        /* On exit, we must delete the return object */
+
+        acpi_ut_remove_reference(obj_desc);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ut_execute_UID
  *
  * PARAMETERS:  device_node         - Node for the device
@@ -144,10 +212,10 @@ cleanup:
 
 acpi_status
 acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
-                    struct acpica_device_id **return_id)
+                    struct acpi_pnp_device_id **return_id)
 {
         union acpi_operand_object *obj_desc;
-        struct acpica_device_id *uid;
+        struct acpi_pnp_device_id *uid;
         u32 length;
         acpi_status status;
 
@@ -171,16 +239,17 @@ acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
         /* Allocate a buffer for the UID */
 
         uid =
-            ACPI_ALLOCATE_ZEROED(sizeof(struct acpica_device_id) +
+            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
                                  (acpi_size) length);
         if (!uid) {
                 status = AE_NO_MEMORY;
                 goto cleanup;
         }
 
-        /* Area for the string starts after DEVICE_ID struct */
+        /* Area for the string starts after PNP_DEVICE_ID struct */
 
-        uid->string = ACPI_ADD_PTR(char, uid, sizeof(struct acpica_device_id));
+        uid->string =
+            ACPI_ADD_PTR(char, uid, sizeof(struct acpi_pnp_device_id));
 
         /* Convert an Integer to string, or just copy an existing string */
 
@@ -226,11 +295,11 @@ cleanup:
 
 acpi_status
 acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
-                    struct acpica_device_id_list **return_cid_list)
+                    struct acpi_pnp_device_id_list **return_cid_list)
 {
         union acpi_operand_object **cid_objects;
         union acpi_operand_object *obj_desc;
-        struct acpica_device_id_list *cid_list;
+        struct acpi_pnp_device_id_list *cid_list;
         char *next_id_string;
         u32 string_area_size;
         u32 length;
@@ -288,11 +357,12 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
         /*
          * Now that we know the length of the CIDs, allocate return buffer:
          * 1) Size of the base structure +
-         * 2) Size of the CID DEVICE_ID array +
+         * 2) Size of the CID PNP_DEVICE_ID array +
          * 3) Size of the actual CID strings
          */
-        cid_list_size = sizeof(struct acpica_device_id_list) +
-            ((count - 1) * sizeof(struct acpica_device_id)) + string_area_size;
+        cid_list_size = sizeof(struct acpi_pnp_device_id_list) +
+            ((count - 1) * sizeof(struct acpi_pnp_device_id)) +
+            string_area_size;
 
         cid_list = ACPI_ALLOCATE_ZEROED(cid_list_size);
         if (!cid_list) {
@@ -300,10 +370,10 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
                 goto cleanup;
         }
 
-        /* Area for CID strings starts after the CID DEVICE_ID array */
+        /* Area for CID strings starts after the CID PNP_DEVICE_ID array */
 
         next_id_string = ACPI_CAST_PTR(char, cid_list->ids) +
-            ((acpi_size) count * sizeof(struct acpica_device_id));
+            ((acpi_size) count * sizeof(struct acpi_pnp_device_id));
 
         /* Copy/convert the CIDs to the return buffer */
 
diff --git a/drivers/acpi/acpica/utmath.c b/drivers/acpi/acpica/utmath.c
index d88a8aaab2a6..49563674833a 100644
--- a/drivers/acpi/acpica/utmath.c
+++ b/drivers/acpi/acpica/utmath.c
@@ -81,7 +81,7 @@ typedef union uint64_overlay {
  * RETURN:      Status (Checks for divide-by-zero)
  *
  * DESCRIPTION: Perform a short (maximum 64 bits divided by 32 bits)
- *              divide and modulo.  The result is a 64-bit quotient and a
+ *              divide and modulo. The result is a 64-bit quotient and a
  *              32-bit remainder.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c
index 33c6cf7ff467..9286a69eb9aa 100644
--- a/drivers/acpi/acpica/utmisc.c
+++ b/drivers/acpi/acpica/utmisc.c
@@ -41,8 +41,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include <linux/module.h>
-
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acnamesp.h"
@@ -201,8 +199,8 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
                                  */
                                 acpi_gbl_owner_id_mask[j] |= (1 << k);
 
-                                acpi_gbl_last_owner_id_index = (u8) j;
-                                acpi_gbl_next_owner_id_offset = (u8) (k + 1);
+                                acpi_gbl_last_owner_id_index = (u8)j;
+                                acpi_gbl_next_owner_id_offset = (u8)(k + 1);
 
                                 /*
                                  * Construct encoded ID from the index and bit position
@@ -252,7 +250,7 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id * owner_id)
  *              control method or unloading a table. Either way, we would
  *              ignore any error anyway.
  *
- * DESCRIPTION: Release a table or method owner ID.  Valid IDs are 1 - 255
+ * DESCRIPTION: Release a table or method owner ID. Valid IDs are 1 - 255
  *
  ******************************************************************************/
 
@@ -339,6 +337,73 @@ void acpi_ut_strupr(char *src_string)
         return;
 }
 
+#ifdef ACPI_ASL_COMPILER
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_strlwr (strlwr)
+ *
+ * PARAMETERS:  src_string      - The source string to convert
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Convert string to lowercase
+ *
+ * NOTE: This is not a POSIX function, so it appears here, not in utclib.c
+ *
+ ******************************************************************************/
+
+void acpi_ut_strlwr(char *src_string)
+{
+        char *string;
+
+        ACPI_FUNCTION_ENTRY();
+
+        if (!src_string) {
+                return;
+        }
+
+        /* Walk entire string, lowercasing the letters */
+
+        for (string = src_string; *string; string++) {
+                *string = (char)ACPI_TOLOWER(*string);
+        }
+
+        return;
+}
+
+/******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_stricmp
+ *
+ * PARAMETERS:  string1             - first string to compare
+ *              string2             - second string to compare
+ *
+ * RETURN:      int that signifies string relationship. Zero means strings
+ *              are equal.
+ *
+ * DESCRIPTION: Implementation of the non-ANSI stricmp function (compare
+ *              strings with no case sensitivity)
+ *
+ ******************************************************************************/
+
+int acpi_ut_stricmp(char *string1, char *string2)
+{
+        int c1;
+        int c2;
+
+        do {
+                c1 = tolower((int)*string1);
+                c2 = tolower((int)*string2);
+
+                string1++;
+                string2++;
+        }
+        while ((c1 == c2) && (c1));
+
+        return (c1 - c2);
+}
+#endif
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_print_string
@@ -469,8 +534,8 @@ u32 acpi_ut_dword_byte_swap(u32 value)
  * RETURN:      None
  *
  * DESCRIPTION: Set the global integer bit width based upon the revision
- *              of the DSDT.  For Revision 1 and 0, Integers are 32 bits.
- *              For Revision 2 and above, Integers are 64 bits.  Yes, this
+ *              of the DSDT. For Revision 1 and 0, Integers are 32 bits.
+ *              For Revision 2 and above, Integers are 64 bits. Yes, this
  *              makes a difference.
  *
  ******************************************************************************/
@@ -606,7 +671,7 @@ u8 acpi_ut_valid_acpi_char(char character, u32 position)
  *
  * RETURN:      TRUE if the name is valid, FALSE otherwise
  *
- * DESCRIPTION: Check for a valid ACPI name.  Each character must be one of:
+ * DESCRIPTION: Check for a valid ACPI name. Each character must be one of:
  *              1) Upper case alpha
  *              2) numeric
  *              3) underscore
@@ -638,29 +703,59 @@ u8 acpi_ut_valid_acpi_name(u32 name)
  * RETURN:      Repaired version of the name
  *
  * DESCRIPTION: Repair an ACPI name: Change invalid characters to '*' and
- *              return the new name.
+ *              return the new name. NOTE: the Name parameter must reside in
+ *              read/write memory, cannot be a const.
+ *
+ * An ACPI Name must consist of valid ACPI characters. We will repair the name
+ * if necessary because we don't want to abort because of this, but we want
+ * all namespace names to be printable. A warning message is appropriate.
+ *
+ * This issue came up because there are in fact machines that exhibit
+ * this problem, and we want to be able to enable ACPI support for them,
+ * even though there are a few bad names.
  *
  ******************************************************************************/
 
-acpi_name acpi_ut_repair_name(char *name)
+void acpi_ut_repair_name(char *name)
 {
-       u32 i;
-        char new_name[ACPI_NAME_SIZE];
+        u32 i;
+        u8 found_bad_char = FALSE;
+        u32 original_name;
+
+        ACPI_FUNCTION_NAME(ut_repair_name);
+
+        ACPI_MOVE_NAME(&original_name, name);
+
+        /* Check each character in the name */
 
         for (i = 0; i < ACPI_NAME_SIZE; i++) {
-                new_name[i] = name[i];
+                if (acpi_ut_valid_acpi_char(name[i], i)) {
+                        continue;
+                }
 
                 /*
                  * Replace a bad character with something printable, yet technically
                  * still invalid. This prevents any collisions with existing "good"
                  * names in the namespace.
                  */
-                if (!acpi_ut_valid_acpi_char(name[i], i)) {
-                        new_name[i] = '*';
-                }
+                name[i] = '*';
+                found_bad_char = TRUE;
         }
 
-        return (*(u32 *) new_name);
+        if (found_bad_char) {
+
+                /* Report warning only if in strict mode or debug mode */
+
+                if (!acpi_gbl_enable_interpreter_slack) {
+                        ACPI_WARNING((AE_INFO,
+                                      "Found bad character(s) in name, repaired: [%4.4s]\n",
+                                      name));
+                } else {
+                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                          "Found bad character(s) in name, repaired: [%4.4s]\n",
+                                          name));
+                }
+        }
 }
 
 /*******************************************************************************
@@ -681,7 +776,7 @@ acpi_name acpi_ut_repair_name(char *name)
  *
  ******************************************************************************/
 
-acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer)
+acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 *ret_integer)
 {
         u32 this_digit = 0;
         u64 return_value = 0;
@@ -754,14 +849,14 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer)
 
                         /* Convert ASCII 0-9 to Decimal value */
 
-                        this_digit = ((u8) * string) - '0';
+                        this_digit = ((u8)*string) - '0';
                 } else if (base == 10) {
 
                         /* Digit is out of range; possible in to_integer case only */
 
                         term = 1;
                 } else {
-                        this_digit = (u8) ACPI_TOUPPER(*string);
+                        this_digit = (u8)ACPI_TOUPPER(*string);
                         if (ACPI_IS_XDIGIT((char)this_digit)) {
 
                                 /* Convert ASCII Hex char to value */
@@ -788,8 +883,9 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * 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,
@@ -800,7 +896,7 @@ acpi_status acpi_ut_strtoul64(char *string, u32 base, u64 * ret_integer)
 
                 /* Divide the digit into the correct position */
 
-                (void)acpi_ut_short_divide((dividend - (u64) this_digit),
+                (void)acpi_ut_short_divide((dividend - (u64)this_digit),
                                            base, &quotient, NULL);
 
                 if (return_value > quotient) {
@@ -890,7 +986,7 @@ acpi_ut_create_update_state_and_push(union acpi_operand_object *object,
  ******************************************************************************/
 
 acpi_status
-acpi_ut_walk_package_tree(union acpi_operand_object * source_object,
+acpi_ut_walk_package_tree(union acpi_operand_object *source_object,
                           void *target_object,
                           acpi_pkg_callback walk_callback, void *context)
 {
@@ -917,10 +1013,10 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object,
 
                 /*
                  * Check for:
-                 * 1) An uninitialized package element.  It is completely
+                 * 1) An uninitialized package element. It is completely
                  *    legal to declare a package and leave it uninitialized
                  * 2) Not an internal object - can be a namespace node instead
-                 * 3) Any type other than a package.  Packages are handled in else
+                 * 3) Any type other than a package. Packages are handled in else
                  *    case below.
                  */
                 if ((!this_source_obj) ||
@@ -939,7 +1035,7 @@ acpi_ut_walk_package_tree(union acpi_operand_object * source_object,
                                state->pkg.source_object->package.count) {
                                 /*
                                  * We've handled all of the objects at this level,  This means
-                                 * that we have just completed a package.  That package may
+                                 * that we have just completed a package. That package may
                                  * have contained one or more packages itself.
                                  *
                                  * Delete this state and pop the previous state (package).
diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
index 296baa676bc5..5ccf57c0d87e 100644
--- a/drivers/acpi/acpica/utmutex.c
+++ b/drivers/acpi/acpica/utmutex.c
@@ -193,6 +193,8 @@ static void acpi_ut_delete_mutex(acpi_mutex_handle mutex_id)
 
         acpi_gbl_mutex_info[mutex_id].mutex = NULL;
         acpi_gbl_mutex_info[mutex_id].thread_id = ACPI_MUTEX_NOT_ACQUIRED;
+
+        return_VOID;
 }
 
 /*******************************************************************************
@@ -226,9 +228,9 @@ acpi_status acpi_ut_acquire_mutex(acpi_mutex_handle mutex_id)
                 /*
                  * Mutex debug code, for internal debugging only.
                  *
-                 * Deadlock prevention.  Check if this thread owns any mutexes of value
-                 * greater than or equal to this one.  If so, the thread has violated
-                 * the mutex ordering rule.  This indicates a coding error somewhere in
+                 * Deadlock prevention. Check if this thread owns any mutexes of value
+                 * greater than or equal to this one. If so, the thread has violated
+                 * the mutex ordering rule. This indicates a coding error somewhere in
                  * the ACPI subsystem code.
                  */
                 for (i = mutex_id; i < ACPI_NUM_MUTEX; i++) {
@@ -319,9 +321,9 @@ acpi_status acpi_ut_release_mutex(acpi_mutex_handle mutex_id)
                 /*
                  * Mutex debug code, for internal debugging only.
                  *
-                 * Deadlock prevention.  Check if this thread owns any mutexes of value
-                 * greater than this one.  If so, the thread has violated the mutex
-                 * ordering rule.  This indicates a coding error somewhere in
+                 * Deadlock prevention. Check if this thread owns any mutexes of value
+                 * greater than this one. If so, the thread has violated the mutex
+                 * ordering rule. This indicates a coding error somewhere in
                  * the ACPI subsystem code.
                  */
                 for (i = mutex_id; i < ACPI_NUM_MUTEX; i++) {
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c
index 655f0799a391..5c52ca78f6fa 100644
--- a/drivers/acpi/acpica/utobject.c
+++ b/drivers/acpi/acpica/utobject.c
@@ -77,7 +77,7 @@ acpi_ut_get_element_length(u8 object_type,
  *
  * NOTE:        We always allocate the worst-case object descriptor because
  *              these objects are cached, and we want them to be
- *              one-size-satisifies-any-request.  This in itself may not be
+ *              one-size-satisifies-any-request. This in itself may not be
  *              the most memory efficient, but the efficiency of the object
  *              cache should more than make up for this!
  *
@@ -370,9 +370,9 @@ u8 acpi_ut_valid_internal_object(void *object)
  *              line_number         - Caller's line number (for error output)
  *              component_id        - Caller's component ID (for error output)
  *
- * RETURN:      Pointer to newly allocated object descriptor.  Null on error
+ * RETURN:      Pointer to newly allocated object descriptor. Null on error
  *
- * DESCRIPTION: Allocate a new object descriptor.  Gracefully handle
+ * DESCRIPTION: Allocate a new object descriptor. Gracefully handle
  *              error conditions.
  *
  ******************************************************************************/
@@ -554,7 +554,7 @@ acpi_ut_get_simple_object_size(union acpi_operand_object *internal_object,
 
         /*
          * Account for the space required by the object rounded up to the next
-         * multiple of the machine word size.  This keeps each object aligned
+         * multiple of the machine word size. This keeps each object aligned
          * on a machine word boundary. (preventing alignment faults on some
          * machines.)
          */
diff --git a/drivers/acpi/acpica/utstate.c b/drivers/acpi/acpica/utstate.c
index a1c988260073..cee0473ba813 100644
--- a/drivers/acpi/acpica/utstate.c
+++ b/drivers/acpi/acpica/utstate.c
@@ -147,7 +147,7 @@ union acpi_generic_state *acpi_ut_pop_generic_state(union acpi_generic_state
  *
  * RETURN:      The new state object. NULL on failure.
  *
- * DESCRIPTION: Create a generic state object.  Attempt to obtain one from
+ * DESCRIPTION: Create a generic state object. Attempt to obtain one from
  *              the global state cache;  If none available, create a new one.
  *
  ******************************************************************************/
diff --git a/drivers/acpi/acpica/uttrack.c b/drivers/acpi/acpica/uttrack.c
new file mode 100644
index 000000000000..a424a9e3fea4
--- /dev/null
+++ b/drivers/acpi/acpica/uttrack.c
@@ -0,0 +1,692 @@
+/******************************************************************************
+ *
+ * Module Name: uttrack - Memory allocation tracking routines (debug only)
+ *
+ *****************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2012, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+/*
+ * These procedures are used for tracking memory leaks in the subsystem, and
+ * they get compiled out when the ACPI_DBG_TRACK_ALLOCATIONS is not set.
+ *
+ * Each memory allocation is tracked via a doubly linked list. Each
+ * element contains the caller's component, module name, function name, and
+ * line number. acpi_ut_allocate and acpi_ut_allocate_zeroed call
+ * acpi_ut_track_allocation to add an element to the list; deletion
+ * occurs in the body of acpi_ut_free.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+
+#define _COMPONENT          ACPI_UTILITIES
+ACPI_MODULE_NAME("uttrack")
+
+/* Local prototypes */
+static struct acpi_debug_mem_block *acpi_ut_find_allocation(struct
+                                                            acpi_debug_mem_block
+                                                            *allocation);
+
+static acpi_status
+acpi_ut_track_allocation(struct acpi_debug_mem_block *address,
+                         acpi_size size,
+                         u8 alloc_type,
+                         u32 component, const char *module, u32 line);
+
+static acpi_status
+acpi_ut_remove_allocation(struct acpi_debug_mem_block *address,
+                          u32 component, const char *module, u32 line);
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_create_list
+ *
+ * PARAMETERS:  cache_name      - Ascii name for the cache
+ *              object_size     - Size of each cached object
+ *              return_cache    - Where the new cache object is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Create a local memory list for tracking purposed
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_create_list(char *list_name,
+                    u16 object_size, struct acpi_memory_list **return_cache)
+{
+        struct acpi_memory_list *cache;
+
+        cache = acpi_os_allocate(sizeof(struct acpi_memory_list));
+        if (!cache) {
+                return (AE_NO_MEMORY);
+        }
+
+        ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list));
+
+        cache->list_name = list_name;
+        cache->object_size = object_size;
+
+        *return_cache = cache;
+        return (AE_OK);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_allocate_and_track
+ *
+ * PARAMETERS:  size                - Size of the allocation
+ *              component           - Component type of caller
+ *              module              - Source file name of caller
+ *              line                - Line number of caller
+ *
+ * RETURN:      Address of the allocated memory on success, NULL on failure.
+ *
+ * DESCRIPTION: The subsystem's equivalent of malloc.
+ *
+ ******************************************************************************/
+
+void *acpi_ut_allocate_and_track(acpi_size size,
+                                 u32 component, const char *module, u32 line)
+{
+        struct acpi_debug_mem_block *allocation;
+        acpi_status status;
+
+        allocation =
+            acpi_ut_allocate(size + sizeof(struct acpi_debug_mem_header),
+                             component, module, line);
+        if (!allocation) {
+                return (NULL);
+        }
+
+        status = acpi_ut_track_allocation(allocation, size,
+                                          ACPI_MEM_MALLOC, component, module,
+                                          line);
+        if (ACPI_FAILURE(status)) {
+                acpi_os_free(allocation);
+                return (NULL);
+        }
+
+        acpi_gbl_global_list->total_allocated++;
+        acpi_gbl_global_list->total_size += (u32)size;
+        acpi_gbl_global_list->current_total_size += (u32)size;
+        if (acpi_gbl_global_list->current_total_size >
+            acpi_gbl_global_list->max_occupied) {
+                acpi_gbl_global_list->max_occupied =
+                    acpi_gbl_global_list->current_total_size;
+        }
+
+        return ((void *)&allocation->user_space);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_allocate_zeroed_and_track
+ *
+ * PARAMETERS:  size                - Size of the allocation
+ *              component           - Component type of caller
+ *              module              - Source file name of caller
+ *              line                - Line number of caller
+ *
+ * RETURN:      Address of the allocated memory on success, NULL on failure.
+ *
+ * DESCRIPTION: Subsystem equivalent of calloc.
+ *
+ ******************************************************************************/
+
+void *acpi_ut_allocate_zeroed_and_track(acpi_size size,
+                                        u32 component,
+                                        const char *module, u32 line)
+{
+        struct acpi_debug_mem_block *allocation;
+        acpi_status status;
+
+        allocation =
+            acpi_ut_allocate_zeroed(size + sizeof(struct acpi_debug_mem_header),
+                                    component, module, line);
+        if (!allocation) {
+
+                /* Report allocation error */
+
+                ACPI_ERROR((module, line,
+                            "Could not allocate size %u", (u32)size));
+                return (NULL);
+        }
+
+        status = acpi_ut_track_allocation(allocation, size,
+                                          ACPI_MEM_CALLOC, component, module,
+                                          line);
+        if (ACPI_FAILURE(status)) {
+                acpi_os_free(allocation);
+                return (NULL);
+        }
+
+        acpi_gbl_global_list->total_allocated++;
+        acpi_gbl_global_list->total_size += (u32)size;
+        acpi_gbl_global_list->current_total_size += (u32)size;
+        if (acpi_gbl_global_list->current_total_size >
+            acpi_gbl_global_list->max_occupied) {
+                acpi_gbl_global_list->max_occupied =
+                    acpi_gbl_global_list->current_total_size;
+        }
+
+        return ((void *)&allocation->user_space);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_free_and_track
+ *
+ * PARAMETERS:  allocation          - Address of the memory to deallocate
+ *              component           - Component type of caller
+ *              module              - Source file name of caller
+ *              line                - Line number of caller
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Frees the memory at Allocation
+ *
+ ******************************************************************************/
+
+void
+acpi_ut_free_and_track(void *allocation,
+                       u32 component, const char *module, u32 line)
+{
+        struct acpi_debug_mem_block *debug_block;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE_PTR(ut_free, allocation);
+
+        if (NULL == allocation) {
+                ACPI_ERROR((module, line, "Attempt to delete a NULL address"));
+
+                return_VOID;
+        }
+
+        debug_block = ACPI_CAST_PTR(struct acpi_debug_mem_block,
+                                    (((char *)allocation) -
+                                     sizeof(struct acpi_debug_mem_header)));
+
+        acpi_gbl_global_list->total_freed++;
+        acpi_gbl_global_list->current_total_size -= debug_block->size;
+
+        status = acpi_ut_remove_allocation(debug_block,
+                                           component, module, line);
+        if (ACPI_FAILURE(status)) {
+                ACPI_EXCEPTION((AE_INFO, status, "Could not free memory"));
+        }
+
+        acpi_os_free(debug_block);
+        ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "%p freed\n", allocation));
+        return_VOID;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_find_allocation
+ *
+ * PARAMETERS:  allocation              - Address of allocated memory
+ *
+ * RETURN:      Three cases:
+ *              1) List is empty, NULL is returned.
+ *              2) Element was found. Returns Allocation parameter.
+ *              3) Element was not found. Returns position where it should be
+ *                  inserted into the list.
+ *
+ * DESCRIPTION: Searches for an element in the global allocation tracking list.
+ *              If the element is not found, returns the location within the
+ *              list where the element should be inserted.
+ *
+ *              Note: The list is ordered by larger-to-smaller addresses.
+ *
+ *              This global list is used to detect memory leaks in ACPICA as
+ *              well as other issues such as an attempt to release the same
+ *              internal object more than once. Although expensive as far
+ *              as cpu time, this list is much more helpful for finding these
+ *              types of issues than using memory leak detectors outside of
+ *              the ACPICA code.
+ *
+ ******************************************************************************/
+
+static struct acpi_debug_mem_block *acpi_ut_find_allocation(struct
+                                                            acpi_debug_mem_block
+                                                            *allocation)
+{
+        struct acpi_debug_mem_block *element;
+
+        element = acpi_gbl_global_list->list_head;
+        if (!element) {
+                return (NULL);
+        }
+
+        /*
+         * Search for the address.
+         *
+         * Note: List is ordered by larger-to-smaller addresses, on the
+         * assumption that a new allocation usually has a larger address
+         * than previous allocations.
+         */
+        while (element > allocation) {
+
+                /* Check for end-of-list */
+
+                if (!element->next) {
+                        return (element);
+                }
+
+                element = element->next;
+        }
+
+        if (element == allocation) {
+                return (element);
+        }
+
+        return (element->previous);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_track_allocation
+ *
+ * PARAMETERS:  allocation          - Address of allocated memory
+ *              size                - Size of the allocation
+ *              alloc_type          - MEM_MALLOC or MEM_CALLOC
+ *              component           - Component type of caller
+ *              module              - Source file name of caller
+ *              line                - Line number of caller
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Inserts an element into the global allocation tracking list.
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_ut_track_allocation(struct acpi_debug_mem_block *allocation,
+                         acpi_size size,
+                         u8 alloc_type,
+                         u32 component, const char *module, u32 line)
+{
+        struct acpi_memory_list *mem_list;
+        struct acpi_debug_mem_block *element;
+        acpi_status status = AE_OK;
+
+        ACPI_FUNCTION_TRACE_PTR(ut_track_allocation, allocation);
+
+        if (acpi_gbl_disable_mem_tracking) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        mem_list = acpi_gbl_global_list;
+        status = acpi_ut_acquire_mutex(ACPI_MTX_MEMORY);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /*
+         * Search the global list for this address to make sure it is not
+         * already present. This will catch several kinds of problems.
+         */
+        element = acpi_ut_find_allocation(allocation);
+        if (element == allocation) {
+                ACPI_ERROR((AE_INFO,
+                            "UtTrackAllocation: Allocation (%p) already present in global list!",
+                            allocation));
+                goto unlock_and_exit;
+        }
+
+        /* Fill in the instance data */
+
+        allocation->size = (u32)size;
+        allocation->alloc_type = alloc_type;
+        allocation->component = component;
+        allocation->line = line;
+
+        ACPI_STRNCPY(allocation->module, module, ACPI_MAX_MODULE_NAME);
+        allocation->module[ACPI_MAX_MODULE_NAME - 1] = 0;
+
+        if (!element) {
+
+                /* Insert at list head */
+
+                if (mem_list->list_head) {
+                        ((struct acpi_debug_mem_block *)(mem_list->list_head))->
+                            previous = allocation;
+                }
+
+                allocation->next = mem_list->list_head;
+                allocation->previous = NULL;
+
+                mem_list->list_head = allocation;
+        } else {
+                /* Insert after element */
+
+                allocation->next = element->next;
+                allocation->previous = element;
+
+                if (element->next) {
+                        (element->next)->previous = allocation;
+                }
+
+                element->next = allocation;
+        }
+
+      unlock_and_exit:
+        status = acpi_ut_release_mutex(ACPI_MTX_MEMORY);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_remove_allocation
+ *
+ * PARAMETERS:  allocation          - Address of allocated memory
+ *              component           - Component type of caller
+ *              module              - Source file name of caller
+ *              line                - Line number of caller
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Deletes an element from the global allocation tracking list.
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_ut_remove_allocation(struct acpi_debug_mem_block *allocation,
+                          u32 component, const char *module, u32 line)
+{
+        struct acpi_memory_list *mem_list;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(ut_remove_allocation);
+
+        if (acpi_gbl_disable_mem_tracking) {
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        mem_list = acpi_gbl_global_list;
+        if (NULL == mem_list->list_head) {
+
+                /* No allocations! */
+
+                ACPI_ERROR((module, line,
+                            "Empty allocation list, nothing to free!"));
+
+                return_ACPI_STATUS(AE_OK);
+        }
+
+        status = acpi_ut_acquire_mutex(ACPI_MTX_MEMORY);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Unlink */
+
+        if (allocation->previous) {
+                (allocation->previous)->next = allocation->next;
+        } else {
+                mem_list->list_head = allocation->next;
+        }
+
+        if (allocation->next) {
+                (allocation->next)->previous = allocation->previous;
+        }
+
+        /* Mark the segment as deleted */
+
+        ACPI_MEMSET(&allocation->user_space, 0xEA, allocation->size);
+
+        ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, "Freeing size 0%X\n",
+                          allocation->size));
+
+        status = acpi_ut_release_mutex(ACPI_MTX_MEMORY);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_dump_allocation_info
+ *
+ * PARAMETERS:  None
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Print some info about the outstanding allocations.
+ *
+ ******************************************************************************/
+
+void acpi_ut_dump_allocation_info(void)
+{
+/*
+        struct acpi_memory_list         *mem_list;
+*/
+
+        ACPI_FUNCTION_TRACE(ut_dump_allocation_info);
+
+/*
+        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
+                          ("%30s: %4d (%3d Kb)\n", "Current allocations",
+                          mem_list->current_count,
+                          ROUND_UP_TO_1K (mem_list->current_size)));
+
+        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
+                          ("%30s: %4d (%3d Kb)\n", "Max concurrent allocations",
+                          mem_list->max_concurrent_count,
+                          ROUND_UP_TO_1K (mem_list->max_concurrent_size)));
+
+        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
+                          ("%30s: %4d (%3d Kb)\n", "Total (all) internal objects",
+                          running_object_count,
+                          ROUND_UP_TO_1K (running_object_size)));
+
+        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
+                          ("%30s: %4d (%3d Kb)\n", "Total (all) allocations",
+                          running_alloc_count,
+                          ROUND_UP_TO_1K (running_alloc_size)));
+
+        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
+                          ("%30s: %4d (%3d Kb)\n", "Current Nodes",
+                          acpi_gbl_current_node_count,
+                          ROUND_UP_TO_1K (acpi_gbl_current_node_size)));
+
+        ACPI_DEBUG_PRINT (TRACE_ALLOCATIONS | TRACE_TABLES,
+                          ("%30s: %4d (%3d Kb)\n", "Max Nodes",
+                          acpi_gbl_max_concurrent_node_count,
+                          ROUND_UP_TO_1K ((acpi_gbl_max_concurrent_node_count *
+                                         sizeof (struct acpi_namespace_node)))));
+*/
+        return_VOID;
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_dump_allocations
+ *
+ * PARAMETERS:  component           - Component(s) to dump info for.
+ *              module              - Module to dump info for. NULL means all.
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Print a list of all outstanding allocations.
+ *
+ ******************************************************************************/
+
+void acpi_ut_dump_allocations(u32 component, const char *module)
+{
+        struct acpi_debug_mem_block *element;
+        union acpi_descriptor *descriptor;
+        u32 num_outstanding = 0;
+        u8 descriptor_type;
+
+        ACPI_FUNCTION_TRACE(ut_dump_allocations);
+
+        if (acpi_gbl_disable_mem_tracking) {
+                return_VOID;
+        }
+
+        /*
+         * Walk the allocation list.
+         */
+        if (ACPI_FAILURE(acpi_ut_acquire_mutex(ACPI_MTX_MEMORY))) {
+                return_VOID;
+        }
+
+        element = acpi_gbl_global_list->list_head;
+        while (element) {
+                if ((element->component & component) &&
+                    ((module == NULL)
+                     || (0 == ACPI_STRCMP(module, element->module)))) {
+                        descriptor =
+                            ACPI_CAST_PTR(union acpi_descriptor,
+                                          &element->user_space);
+
+                        if (element->size <
+                            sizeof(struct acpi_common_descriptor)) {
+                                acpi_os_printf("%p Length 0x%04X %9.9s-%u "
+                                               "[Not a Descriptor - too small]\n",
+                                               descriptor, element->size,
+                                               element->module, element->line);
+                        } else {
+                                /* Ignore allocated objects that are in a cache */
+
+                                if (ACPI_GET_DESCRIPTOR_TYPE(descriptor) !=
+                                    ACPI_DESC_TYPE_CACHED) {
+                                        acpi_os_printf
+                                            ("%p Length 0x%04X %9.9s-%u [%s] ",
+                                             descriptor, element->size,
+                                             element->module, element->line,
+                                             acpi_ut_get_descriptor_name
+                                             (descriptor));
+
+                                        /* Validate the descriptor type using Type field and length */
+
+                                        descriptor_type = 0;    /* Not a valid descriptor type */
+
+                                        switch (ACPI_GET_DESCRIPTOR_TYPE
+                                                (descriptor)) {
+                                        case ACPI_DESC_TYPE_OPERAND:
+                                                if (element->size ==
+                                                    sizeof(union
+                                                           acpi_operand_object))
+                                                {
+                                                        descriptor_type =
+                                                            ACPI_DESC_TYPE_OPERAND;
+                                                }
+                                                break;
+
+                                        case ACPI_DESC_TYPE_PARSER:
+                                                if (element->size ==
+                                                    sizeof(union
+                                                           acpi_parse_object)) {
+                                                        descriptor_type =
+                                                            ACPI_DESC_TYPE_PARSER;
+                                                }
+                                                break;
+
+                                        case ACPI_DESC_TYPE_NAMED:
+                                                if (element->size ==
+                                                    sizeof(struct
+                                                           acpi_namespace_node))
+                                                {
+                                                        descriptor_type =
+                                                            ACPI_DESC_TYPE_NAMED;
+                                                }
+                                                break;
+
+                                        default:
+                                                break;
+                                        }
+
+                                        /* Display additional info for the major descriptor types */
+
+                                        switch (descriptor_type) {
+                                        case ACPI_DESC_TYPE_OPERAND:
+                                                acpi_os_printf
+                                                    ("%12.12s RefCount 0x%04X\n",
+                                                     acpi_ut_get_type_name
+                                                     (descriptor->object.common.
+                                                      type),
+                                                     descriptor->object.common.
+                                                     reference_count);
+                                                break;
+
+                                        case ACPI_DESC_TYPE_PARSER:
+                                                acpi_os_printf
+                                                    ("AmlOpcode 0x%04hX\n",
+                                                     descriptor->op.asl.
+                                                     aml_opcode);
+                                                break;
+
+                                        case ACPI_DESC_TYPE_NAMED:
+                                                acpi_os_printf("%4.4s\n",
+                                                               acpi_ut_get_node_name
+                                                               (&descriptor->
+                                                                node));
+                                                break;
+
+                                        default:
+                                                acpi_os_printf("\n");
+                                                break;
+                                        }
+                                }
+                        }
+
+                        num_outstanding++;
+                }
+
+                element = element->next;
+        }
+
+        (void)acpi_ut_release_mutex(ACPI_MTX_MEMORY);
+
+        /* Print summary */
+
+        if (!num_outstanding) {
+                ACPI_INFO((AE_INFO, "No outstanding allocations"));
+        } else {
+                ACPI_ERROR((AE_INFO, "%u(0x%X) Outstanding allocations",
+                            num_outstanding, num_outstanding));
+        }
+
+        return_VOID;
+}
+
+#endif                          /* ACPI_DBG_TRACK_ALLOCATIONS */
diff --git a/drivers/acpi/acpica/utxface.c b/drivers/acpi/acpica/utxface.c
index b09632b4f5b3..390db0ca5e2e 100644
--- a/drivers/acpi/acpica/utxface.c
+++ b/drivers/acpi/acpica/utxface.c
@@ -147,7 +147,7 @@ ACPI_EXPORT_SYMBOL(acpi_subsystem_status)
  * RETURN:      status          - the status of the call
  *
  * DESCRIPTION: This function is called to get information about the current
- *              state of the ACPI subsystem.  It will return system information
+ *              state of the ACPI subsystem. It will return system information
  *              in the out_buffer.
  *
  *              If the function fails an appropriate status will be returned
@@ -238,7 +238,7 @@ acpi_install_initialization_handler(acpi_init_handler handler, u32 function)
         }
 
         acpi_gbl_init_handler = handler;
-        return AE_OK;
+        return (AE_OK);
 }
 
 ACPI_EXPORT_SYMBOL(acpi_install_initialization_handler)
@@ -263,6 +263,7 @@ acpi_status acpi_purge_cached_objects(void)
         (void)acpi_os_purge_cache(acpi_gbl_operand_cache);
         (void)acpi_os_purge_cache(acpi_gbl_ps_node_cache);
         (void)acpi_os_purge_cache(acpi_gbl_ps_node_ext_cache);
+
         return_ACPI_STATUS(AE_OK);
 }
 
diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c
index 6d63cc39b9ae..d4d3826140d8 100644
--- a/drivers/acpi/acpica/utxferror.c
+++ b/drivers/acpi/acpica/utxferror.c
@@ -408,7 +408,7 @@ acpi_ut_namespace_error(const char *module_name,
 
                 ACPI_MOVE_32_TO_32(&bad_name,
                                    ACPI_CAST_PTR(u32, internal_name));
-                acpi_os_printf("[0x%4.4X] (NON-ASCII)", bad_name);
+                acpi_os_printf("[0x%.8X] (NON-ASCII)", bad_name);
         } else {
                 /* Convert path to external format */
 
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index d59175efc428..1f0d457ecbcf 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -257,7 +257,15 @@ static int __acpi_bus_get_power(struct acpi_device *device, int *state)
 }
 
 
-static int __acpi_bus_set_power(struct acpi_device *device, int state)
+/**
+ * acpi_device_set_power - Set power state of an ACPI device.
+ * @device: Device to set the power state of.
+ * @state: New power state to set.
+ *
+ * Callers must ensure that the device is power manageable before using this
+ * function.
+ */
+int acpi_device_set_power(struct acpi_device *device, int state)
 {
         int result = 0;
         acpi_status status = AE_OK;
@@ -298,6 +306,12 @@ static int __acpi_bus_set_power(struct acpi_device *device, int state)
          * a lower-powered state.
          */
         if (state < device->power.state) {
+                if (device->power.state >= ACPI_STATE_D3_HOT &&
+                    state != ACPI_STATE_D0) {
+                        printk(KERN_WARNING PREFIX
+                              "Cannot transition to non-D0 state from D3\n");
+                        return -ENODEV;
+                }
                 if (device->power.flags.power_resources) {
                         result = acpi_power_transition(device, state);
                         if (result)
@@ -341,6 +355,7 @@ static int __acpi_bus_set_power(struct acpi_device *device, int state)
 
         return result;
 }
+EXPORT_SYMBOL(acpi_device_set_power);
 
 
 int acpi_bus_set_power(acpi_handle handle, int state)
@@ -359,7 +374,7 @@ int acpi_bus_set_power(acpi_handle handle, int state)
                 return -ENODEV;
         }
 
-        return __acpi_bus_set_power(device, state);
+        return acpi_device_set_power(device, state);
 }
 EXPORT_SYMBOL(acpi_bus_set_power);
 
@@ -402,7 +417,7 @@ int acpi_bus_update_power(acpi_handle handle, int *state_p)
         if (result)
                 return result;
 
-        result = __acpi_bus_set_power(device, state);
+        result = acpi_device_set_power(device, state);
         if (!result && state_p)
                 *state_p = state;
 
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
new file mode 100644
index 000000000000..f09dc987cf17
--- /dev/null
+++ b/drivers/acpi/device_pm.c
@@ -0,0 +1,668 @@
+/*
+ * drivers/acpi/device_pm.c - ACPI device power management routines.
+ *
+ * Copyright (C) 2012, Intel Corp.
+ * Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+
+#include <linux/device.h>
+#include <linux/export.h>
+#include <linux/mutex.h>
+#include <linux/pm_qos.h>
+#include <linux/pm_runtime.h>
+
+#include <acpi/acpi.h>
+#include <acpi/acpi_bus.h>
+
+static DEFINE_MUTEX(acpi_pm_notifier_lock);
+
+/**
+ * acpi_add_pm_notifier - Register PM notifier for given ACPI device.
+ * @adev: ACPI device to add the notifier for.
+ * @context: Context information to pass to the notifier routine.
+ *
+ * NOTE: @adev need not be a run-wake or wakeup device to be a valid source of
+ * PM wakeup events.  For example, wakeup events may be generated for bridges
+ * if one of the devices below the bridge is signaling wakeup, even if the
+ * bridge itself doesn't have a wakeup GPE associated with it.
+ */
+acpi_status acpi_add_pm_notifier(struct acpi_device *adev,
+                                 acpi_notify_handler handler, void *context)
+{
+        acpi_status status = AE_ALREADY_EXISTS;
+
+        mutex_lock(&acpi_pm_notifier_lock);
+
+        if (adev->wakeup.flags.notifier_present)
+                goto out;
+
+        status = acpi_install_notify_handler(adev->handle,
+                                             ACPI_SYSTEM_NOTIFY,
+                                             handler, context);
+        if (ACPI_FAILURE(status))
+                goto out;
+
+        adev->wakeup.flags.notifier_present = true;
+
+ out:
+        mutex_unlock(&acpi_pm_notifier_lock);
+        return status;
+}
+
+/**
+ * acpi_remove_pm_notifier - Unregister PM notifier from given ACPI device.
+ * @adev: ACPI device to remove the notifier from.
+ */
+acpi_status acpi_remove_pm_notifier(struct acpi_device *adev,
+                                    acpi_notify_handler handler)
+{
+        acpi_status status = AE_BAD_PARAMETER;
+
+        mutex_lock(&acpi_pm_notifier_lock);
+
+        if (!adev->wakeup.flags.notifier_present)
+                goto out;
+
+        status = acpi_remove_notify_handler(adev->handle,
+                                            ACPI_SYSTEM_NOTIFY,
+                                            handler);
+        if (ACPI_FAILURE(status))
+                goto out;
+
+        adev->wakeup.flags.notifier_present = false;
+
+ out:
+        mutex_unlock(&acpi_pm_notifier_lock);
+        return status;
+}
+
+/**
+ * acpi_device_power_state - Get preferred power state of ACPI device.
+ * @dev: Device whose preferred target power state to return.
+ * @adev: ACPI device node corresponding to @dev.
+ * @target_state: System state to match the resultant device state.
+ * @d_max_in: Deepest low-power state to take into consideration.
+ * @d_min_p: Location to store the upper limit of the allowed states range.
+ * Return value: Preferred power state of the device on success, -ENODEV
+ * (if there's no 'struct acpi_device' for @dev) or -EINVAL on failure
+ *
+ * Find the lowest power (highest number) ACPI device power state that the
+ * device can be in while the system is in the state represented by
+ * @target_state.  If @d_min_p is set, the highest power (lowest number) device
+ * power state that @dev can be in for the given system sleep state is stored
+ * at the location pointed to by it.
+ *
+ * Callers must ensure that @dev and @adev are valid pointers and that @adev
+ * actually corresponds to @dev before using this function.
+ */
+int acpi_device_power_state(struct device *dev, struct acpi_device *adev,
+                            u32 target_state, int d_max_in, int *d_min_p)
+{
+        char acpi_method[] = "_SxD";
+        unsigned long long d_min, d_max;
+        bool wakeup = false;
+
+        if (d_max_in < ACPI_STATE_D0 || d_max_in > ACPI_STATE_D3)
+                return -EINVAL;
+
+        if (d_max_in > ACPI_STATE_D3_HOT) {
+                enum pm_qos_flags_status stat;
+
+                stat = dev_pm_qos_flags(dev, PM_QOS_FLAG_NO_POWER_OFF);
+                if (stat == PM_QOS_FLAGS_ALL)
+                        d_max_in = ACPI_STATE_D3_HOT;
+        }
+
+        acpi_method[2] = '0' + target_state;
+        /*
+         * If the sleep state is S0, the lowest limit from ACPI is D3,
+         * but if the device has _S0W, we will use the value from _S0W
+         * as the lowest limit from ACPI.  Finally, we will constrain
+         * the lowest limit with the specified one.
+         */
+        d_min = ACPI_STATE_D0;
+        d_max = ACPI_STATE_D3;
+
+        /*
+         * If present, _SxD methods return the minimum D-state (highest power
+         * state) we can use for the corresponding S-states.  Otherwise, the
+         * minimum D-state is D0 (ACPI 3.x).
+         *
+         * NOTE: We rely on acpi_evaluate_integer() not clobbering the integer
+         * provided -- that's our fault recovery, we ignore retval.
+         */
+        if (target_state > ACPI_STATE_S0) {
+                acpi_evaluate_integer(adev->handle, acpi_method, NULL, &d_min);
+                wakeup = device_may_wakeup(dev) && adev->wakeup.flags.valid
+                        && adev->wakeup.sleep_state >= target_state;
+        } else if (dev_pm_qos_flags(dev, PM_QOS_FLAG_REMOTE_WAKEUP) !=
+                        PM_QOS_FLAGS_NONE) {
+                wakeup = adev->wakeup.flags.valid;
+        }
+
+        /*
+         * If _PRW says we can wake up the system from the target sleep state,
+         * the D-state returned by _SxD is sufficient for that (we assume a
+         * wakeup-aware driver if wake is set).  Still, if _SxW exists
+         * (ACPI 3.x), it should return the maximum (lowest power) D-state that
+         * can wake the system.  _S0W may be valid, too.
+         */
+        if (wakeup) {
+                acpi_status status;
+
+                acpi_method[3] = 'W';
+                status = acpi_evaluate_integer(adev->handle, acpi_method, NULL,
+                                                &d_max);
+                if (ACPI_FAILURE(status)) {
+                        if (target_state != ACPI_STATE_S0 ||
+                            status != AE_NOT_FOUND)
+                                d_max = d_min;
+                } else if (d_max < d_min) {
+                        /* Warn the user of the broken DSDT */
+                        printk(KERN_WARNING "ACPI: Wrong value from %s\n",
+                                acpi_method);
+                        /* Sanitize it */
+                        d_min = d_max;
+                }
+        }
+
+        if (d_max_in < d_min)
+                return -EINVAL;
+        if (d_min_p)
+                *d_min_p = d_min;
+        /* constrain d_max with specified lowest limit (max number) */
+        if (d_max > d_max_in) {
+                for (d_max = d_max_in; d_max > d_min; d_max--) {
+                        if (adev->power.states[d_max].flags.valid)
+                                break;
+                }
+        }
+        return d_max;
+}
+EXPORT_SYMBOL_GPL(acpi_device_power_state);
+
+/**
+ * acpi_pm_device_sleep_state - Get preferred power state of ACPI device.
+ * @dev: Device whose preferred target power state to return.
+ * @d_min_p: Location to store the upper limit of the allowed states range.
+ * @d_max_in: Deepest low-power state to take into consideration.
+ * Return value: Preferred power state of the device on success, -ENODEV
+ * (if there's no 'struct acpi_device' for @dev) or -EINVAL on failure
+ *
+ * The caller must ensure that @dev is valid before using this function.
+ */
+int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p, int d_max_in)
+{
+        acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
+        struct acpi_device *adev;
+
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
+                dev_dbg(dev, "ACPI handle without context in %s!\n", __func__);
+                return -ENODEV;
+        }
+
+        return acpi_device_power_state(dev, adev, acpi_target_system_state(),
+                                       d_max_in, d_min_p);
+}
+EXPORT_SYMBOL(acpi_pm_device_sleep_state);
+
+#ifdef CONFIG_PM_RUNTIME
+/**
+ * acpi_wakeup_device - Wakeup notification handler for ACPI devices.
+ * @handle: ACPI handle of the device the notification is for.
+ * @event: Type of the signaled event.
+ * @context: Device corresponding to @handle.
+ */
+static void acpi_wakeup_device(acpi_handle handle, u32 event, void *context)
+{
+        struct device *dev = context;
+
+        if (event == ACPI_NOTIFY_DEVICE_WAKE && dev) {
+                pm_wakeup_event(dev, 0);
+                pm_runtime_resume(dev);
+        }
+}
+
+/**
+ * __acpi_device_run_wake - Enable/disable runtime remote wakeup for device.
+ * @adev: ACPI device to enable/disable the remote wakeup for.
+ * @enable: Whether to enable or disable the wakeup functionality.
+ *
+ * Enable/disable the GPE associated with @adev so that it can generate
+ * wakeup signals for the device in response to external (remote) events and
+ * enable/disable device wakeup power.
+ *
+ * Callers must ensure that @adev is a valid ACPI device node before executing
+ * this function.
+ */
+int __acpi_device_run_wake(struct acpi_device *adev, bool enable)
+{
+        struct acpi_device_wakeup *wakeup = &adev->wakeup;
+
+        if (enable) {
+                acpi_status res;
+                int error;
+
+                error = acpi_enable_wakeup_device_power(adev, ACPI_STATE_S0);
+                if (error)
+                        return error;
+
+                res = acpi_enable_gpe(wakeup->gpe_device, wakeup->gpe_number);
+                if (ACPI_FAILURE(res)) {
+                        acpi_disable_wakeup_device_power(adev);
+                        return -EIO;
+                }
+        } else {
+                acpi_disable_gpe(wakeup->gpe_device, wakeup->gpe_number);
+                acpi_disable_wakeup_device_power(adev);
+        }
+        return 0;
+}
+
+/**
+ * acpi_pm_device_run_wake - Enable/disable remote wakeup for given device.
+ * @dev: Device to enable/disable the platform to wake up.
+ * @enable: Whether to enable or disable the wakeup functionality.
+ */
+int acpi_pm_device_run_wake(struct device *phys_dev, bool enable)
+{
+        struct acpi_device *adev;
+        acpi_handle handle;
+
+        if (!device_run_wake(phys_dev))
+                return -EINVAL;
+
+        handle = DEVICE_ACPI_HANDLE(phys_dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
+                dev_dbg(phys_dev, "ACPI handle without context in %s!\n",
+                        __func__);
+                return -ENODEV;
+        }
+
+        return __acpi_device_run_wake(adev, enable);
+}
+EXPORT_SYMBOL(acpi_pm_device_run_wake);
+#else
+static inline void acpi_wakeup_device(acpi_handle handle, u32 event,
+                                      void *context) {}
+#endif /* CONFIG_PM_RUNTIME */
+
+ #ifdef CONFIG_PM_SLEEP
+/**
+ * __acpi_device_sleep_wake - Enable or disable device to wake up the system.
+ * @dev: Device to enable/desible to wake up the system.
+ * @target_state: System state the device is supposed to wake up from.
+ * @enable: Whether to enable or disable @dev to wake up the system.
+ */
+int __acpi_device_sleep_wake(struct acpi_device *adev, u32 target_state,
+                             bool enable)
+{
+        return enable ?
+                acpi_enable_wakeup_device_power(adev, target_state) :
+                acpi_disable_wakeup_device_power(adev);
+}
+
+/**
+ * acpi_pm_device_sleep_wake - Enable or disable device to wake up the system.
+ * @dev: Device to enable/desible to wake up the system from sleep states.
+ * @enable: Whether to enable or disable @dev to wake up the system.
+ */
+int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
+{
+        acpi_handle handle;
+        struct acpi_device *adev;
+        int error;
+
+        if (!device_can_wakeup(dev))
+                return -EINVAL;
+
+        handle = DEVICE_ACPI_HANDLE(dev);
+        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
+                dev_dbg(dev, "ACPI handle without context in %s!\n", __func__);
+                return -ENODEV;
+        }
+
+        error = __acpi_device_sleep_wake(adev, acpi_target_system_state(),
+                                         enable);
+        if (!error)
+                dev_info(dev, "System wakeup %s by ACPI\n",
+                                enable ? "enabled" : "disabled");
+
+        return error;
+}
+#endif /* CONFIG_PM_SLEEP */
+
+/**
+ * acpi_dev_pm_get_node - Get ACPI device node for the given physical device.
+ * @dev: Device to get the ACPI node for.
+ */
+static struct acpi_device *acpi_dev_pm_get_node(struct device *dev)
+{
+        acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
+        struct acpi_device *adev;
+
+        return handle && ACPI_SUCCESS(acpi_bus_get_device(handle, &adev)) ?
+                adev : NULL;
+}
+
+/**
+ * acpi_dev_pm_low_power - Put ACPI device into a low-power state.
+ * @dev: Device to put into a low-power state.
+ * @adev: ACPI device node corresponding to @dev.
+ * @system_state: System state to choose the device state for.
+ */
+static int acpi_dev_pm_low_power(struct device *dev, struct acpi_device *adev,
+                                 u32 system_state)
+{
+        int power_state;
+
+        if (!acpi_device_power_manageable(adev))
+                return 0;
+
+        power_state = acpi_device_power_state(dev, adev, system_state,
+                                              ACPI_STATE_D3, NULL);
+        if (power_state < ACPI_STATE_D0 || power_state > ACPI_STATE_D3)
+                return -EIO;
+
+        return acpi_device_set_power(adev, power_state);
+}
+
+/**
+ * acpi_dev_pm_full_power - Put ACPI device into the full-power state.
+ * @adev: ACPI device node to put into the full-power state.
+ */
+static int acpi_dev_pm_full_power(struct acpi_device *adev)
+{
+        return acpi_device_power_manageable(adev) ?
+                acpi_device_set_power(adev, ACPI_STATE_D0) : 0;
+}
+
+#ifdef CONFIG_PM_RUNTIME
+/**
+ * acpi_dev_runtime_suspend - Put device into a low-power state using ACPI.
+ * @dev: Device to put into a low-power state.
+ *
+ * Put the given device into a runtime low-power state using the standard ACPI
+ * mechanism.  Set up remote wakeup if desired, choose the state to put the
+ * device into (this checks if remote wakeup is expected to work too), and set
+ * the power state of the device.
+ */
+int acpi_dev_runtime_suspend(struct device *dev)
+{
+        struct acpi_device *adev = acpi_dev_pm_get_node(dev);
+        bool remote_wakeup;
+        int error;
+
+        if (!adev)
+                return 0;
+
+        remote_wakeup = dev_pm_qos_flags(dev, PM_QOS_FLAG_REMOTE_WAKEUP) >
+                                PM_QOS_FLAGS_NONE;
+        error = __acpi_device_run_wake(adev, remote_wakeup);
+        if (remote_wakeup && error)
+                return -EAGAIN;
+
+        error = acpi_dev_pm_low_power(dev, adev, ACPI_STATE_S0);
+        if (error)
+                __acpi_device_run_wake(adev, false);
+
+        return error;
+}
+EXPORT_SYMBOL_GPL(acpi_dev_runtime_suspend);
+
+/**
+ * acpi_dev_runtime_resume - Put device into the full-power state using ACPI.
+ * @dev: Device to put into the full-power state.
+ *
+ * Put the given device into the full-power state using the standard ACPI
+ * mechanism at run time.  Set the power state of the device to ACPI D0 and
+ * disable remote wakeup.
+ */
+int acpi_dev_runtime_resume(struct device *dev)
+{
+        struct acpi_device *adev = acpi_dev_pm_get_node(dev);
+        int error;
+
+        if (!adev)
+                return 0;
+
+        error = acpi_dev_pm_full_power(adev);
+        __acpi_device_run_wake(adev, false);
+        return error;
+}
+EXPORT_SYMBOL_GPL(acpi_dev_runtime_resume);
+
+/**
+ * acpi_subsys_runtime_suspend - Suspend device using ACPI.
+ * @dev: Device to suspend.
+ *
+ * Carry out the generic runtime suspend procedure for @dev and use ACPI to put
+ * it into a runtime low-power state.
+ */
+int acpi_subsys_runtime_suspend(struct device *dev)
+{
+        int ret = pm_generic_runtime_suspend(dev);
+        return ret ? ret : acpi_dev_runtime_suspend(dev);
+}
+EXPORT_SYMBOL_GPL(acpi_subsys_runtime_suspend);
+
+/**
+ * acpi_subsys_runtime_resume - Resume device using ACPI.
+ * @dev: Device to Resume.
+ *
+ * Use ACPI to put the given device into the full-power state and carry out the
+ * generic runtime resume procedure for it.
+ */
+int acpi_subsys_runtime_resume(struct device *dev)
+{
+        int ret = acpi_dev_runtime_resume(dev);
+        return ret ? ret : pm_generic_runtime_resume(dev);
+}
+EXPORT_SYMBOL_GPL(acpi_subsys_runtime_resume);
+#endif /* CONFIG_PM_RUNTIME */
+
+#ifdef CONFIG_PM_SLEEP
+/**
+ * acpi_dev_suspend_late - Put device into a low-power state using ACPI.
+ * @dev: Device to put into a low-power state.
+ *
+ * Put the given device into a low-power state during system transition to a
+ * sleep state using the standard ACPI mechanism.  Set up system wakeup if
+ * desired, choose the state to put the device into (this checks if system
+ * wakeup is expected to work too), and set the power state of the device.
+ */
+int acpi_dev_suspend_late(struct device *dev)
+{
+        struct acpi_device *adev = acpi_dev_pm_get_node(dev);
+        u32 target_state;
+        bool wakeup;
+        int error;
+
+        if (!adev)
+                return 0;
+
+        target_state = acpi_target_system_state();
+        wakeup = device_may_wakeup(dev);
+        error = __acpi_device_sleep_wake(adev, target_state, wakeup);
+        if (wakeup && error)
+                return error;
+
+        error = acpi_dev_pm_low_power(dev, adev, target_state);
+        if (error)
+                __acpi_device_sleep_wake(adev, ACPI_STATE_UNKNOWN, false);
+
+        return error;
+}
+EXPORT_SYMBOL_GPL(acpi_dev_suspend_late);
+
+/**
+ * acpi_dev_resume_early - Put device into the full-power state using ACPI.
+ * @dev: Device to put into the full-power state.
+ *
+ * Put the given device into the full-power state using the standard ACPI
+ * mechanism during system transition to the working state.  Set the power
+ * state of the device to ACPI D0 and disable remote wakeup.
+ */
+int acpi_dev_resume_early(struct device *dev)
+{
+        struct acpi_device *adev = acpi_dev_pm_get_node(dev);
+        int error;
+
+        if (!adev)
+                return 0;
+
+        error = acpi_dev_pm_full_power(adev);
+        __acpi_device_sleep_wake(adev, ACPI_STATE_UNKNOWN, false);
+        return error;
+}
+EXPORT_SYMBOL_GPL(acpi_dev_resume_early);
+
+/**
+ * acpi_subsys_prepare - Prepare device for system transition to a sleep state.
+ * @dev: Device to prepare.
+ */
+int acpi_subsys_prepare(struct device *dev)
+{
+        /*
+         * Follow PCI and resume devices suspended at run time before running
+         * their system suspend callbacks.
+         */
+        pm_runtime_resume(dev);
+        return pm_generic_prepare(dev);
+}
+EXPORT_SYMBOL_GPL(acpi_subsys_prepare);
+
+/**
+ * acpi_subsys_suspend_late - Suspend device using ACPI.
+ * @dev: Device to suspend.
+ *
+ * Carry out the generic late suspend procedure for @dev and use ACPI to put
+ * it into a low-power state during system transition into a sleep state.
+ */
+int acpi_subsys_suspend_late(struct device *dev)
+{
+        int ret = pm_generic_suspend_late(dev);
+        return ret ? ret : acpi_dev_suspend_late(dev);
+}
+EXPORT_SYMBOL_GPL(acpi_subsys_suspend_late);
+
+/**
+ * acpi_subsys_resume_early - Resume device using ACPI.
+ * @dev: Device to Resume.
+ *
+ * Use ACPI to put the given device into the full-power state and carry out the
+ * generic early resume procedure for it during system transition into the
+ * working state.
+ */
+int acpi_subsys_resume_early(struct device *dev)
+{
+        int ret = acpi_dev_resume_early(dev);
+        return ret ? ret : pm_generic_resume_early(dev);
+}
+EXPORT_SYMBOL_GPL(acpi_subsys_resume_early);
+#endif /* CONFIG_PM_SLEEP */
+
+static struct dev_pm_domain acpi_general_pm_domain = {
+        .ops = {
+#ifdef CONFIG_PM_RUNTIME
+                .runtime_suspend = acpi_subsys_runtime_suspend,
+                .runtime_resume = acpi_subsys_runtime_resume,
+                .runtime_idle = pm_generic_runtime_idle,
+#endif
+#ifdef CONFIG_PM_SLEEP
+                .prepare = acpi_subsys_prepare,
+                .suspend_late = acpi_subsys_suspend_late,
+                .resume_early = acpi_subsys_resume_early,
+                .poweroff_late = acpi_subsys_suspend_late,
+                .restore_early = acpi_subsys_resume_early,
+#endif
+        },
+};
+
+/**
+ * acpi_dev_pm_attach - Prepare device for ACPI power management.
+ * @dev: Device to prepare.
+ * @power_on: Whether or not to power on the device.
+ *
+ * If @dev has a valid ACPI handle that has a valid struct acpi_device object
+ * attached to it, install a wakeup notification handler for the device and
+ * add it to the general ACPI PM domain.  If @power_on is set, the device will
+ * be put into the ACPI D0 state before the function returns.
+ *
+ * This assumes that the @dev's bus type uses generic power management callbacks
+ * (or doesn't use any power management callbacks at all).
+ *
+ * Callers must ensure proper synchronization of this function with power
+ * management callbacks.
+ */
+int acpi_dev_pm_attach(struct device *dev, bool power_on)
+{
+        struct acpi_device *adev = acpi_dev_pm_get_node(dev);
+
+        if (!adev)
+                return -ENODEV;
+
+        if (dev->pm_domain)
+                return -EEXIST;
+
+        acpi_add_pm_notifier(adev, acpi_wakeup_device, dev);
+        dev->pm_domain = &acpi_general_pm_domain;
+        if (power_on) {
+                acpi_dev_pm_full_power(adev);
+                __acpi_device_run_wake(adev, false);
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
+
+/**
+ * acpi_dev_pm_detach - Remove ACPI power management from the device.
+ * @dev: Device to take care of.
+ * @power_off: Whether or not to try to remove power from the device.
+ *
+ * Remove the device from the general ACPI PM domain and remove its wakeup
+ * notifier.  If @power_off is set, additionally remove power from the device if
+ * possible.
+ *
+ * Callers must ensure proper synchronization of this function with power
+ * management callbacks.
+ */
+void acpi_dev_pm_detach(struct device *dev, bool power_off)
+{
+        struct acpi_device *adev = acpi_dev_pm_get_node(dev);
+
+        if (adev && dev->pm_domain == &acpi_general_pm_domain) {
+                dev->pm_domain = NULL;
+                acpi_remove_pm_notifier(adev, acpi_wakeup_device);
+                if (power_off) {
+                        /*
+                         * If the device's PM QoS resume latency limit or flags
+                         * have been exposed to user space, they have to be
+                         * hidden at this point, so that they don't affect the
+                         * choice of the low-power state to put the device into.
+                         */
+                        dev_pm_qos_hide_latency_limit(dev);
+                        dev_pm_qos_hide_flags(dev);
+                        __acpi_device_run_wake(adev, false);
+                        acpi_dev_pm_low_power(dev, adev, ACPI_STATE_S0);
+                }
+        }
+}
+EXPORT_SYMBOL_GPL(acpi_dev_pm_detach);
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 08373086cd7e..01551840d236 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -130,46 +130,59 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
 {
         struct acpi_device *acpi_dev;
         acpi_status status;
-        struct acpi_device_physical_node *physical_node;
+        struct acpi_device_physical_node *physical_node, *pn;
         char physical_node_name[sizeof(PHYSICAL_NODE_STRING) + 2];
         int retval = -EINVAL;
 
-        if (dev->archdata.acpi_handle) {
-                dev_warn(dev, "Drivers changed 'acpi_handle'\n");
-                return -EINVAL;
+        if (ACPI_HANDLE(dev)) {
+                if (handle) {
+                        dev_warn(dev, "ACPI handle is already set\n");
+                        return -EINVAL;
+                } else {
+                        handle = ACPI_HANDLE(dev);
+                }
         }
+        if (!handle)
+                return -EINVAL;
 
         get_device(dev);
         status = acpi_bus_get_device(handle, &acpi_dev);
         if (ACPI_FAILURE(status))
                 goto err;
 
-        physical_node = kzalloc(sizeof(struct acpi_device_physical_node),
-                GFP_KERNEL);
+        physical_node = kzalloc(sizeof(*physical_node), GFP_KERNEL);
         if (!physical_node) {
                 retval = -ENOMEM;
                 goto err;
         }
 
         mutex_lock(&acpi_dev->physical_node_lock);
+
+        /* Sanity check. */
+        list_for_each_entry(pn, &acpi_dev->physical_node_list, node)
+                if (pn->dev == dev) {
+                        dev_warn(dev, "Already associated with ACPI node\n");
+                        goto err_free;
+                }
+
         /* allocate physical node id according to physical_node_id_bitmap */
         physical_node->node_id =
                 find_first_zero_bit(acpi_dev->physical_node_id_bitmap,
                 ACPI_MAX_PHYSICAL_NODE);
         if (physical_node->node_id >= ACPI_MAX_PHYSICAL_NODE) {
                 retval = -ENOSPC;
-                mutex_unlock(&acpi_dev->physical_node_lock);
-                kfree(physical_node);
-                goto err;
+                goto err_free;
         }
 
         set_bit(physical_node->node_id, acpi_dev->physical_node_id_bitmap);
         physical_node->dev = dev;
         list_add_tail(&physical_node->node, &acpi_dev->physical_node_list);
         acpi_dev->physical_node_count++;
+
         mutex_unlock(&acpi_dev->physical_node_lock);
 
-        dev->archdata.acpi_handle = handle;
+        if (!ACPI_HANDLE(dev))
+                ACPI_HANDLE_SET(dev, acpi_dev->handle);
 
         if (!physical_node->node_id)
                 strcpy(physical_node_name, PHYSICAL_NODE_STRING);
@@ -187,8 +200,14 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
         return 0;
 
  err:
+        ACPI_HANDLE_SET(dev, NULL);
         put_device(dev);
         return retval;
+
+ err_free:
+        mutex_unlock(&acpi_dev->physical_node_lock);
+        kfree(physical_node);
+        goto err;
 }
 
 static int acpi_unbind_one(struct device *dev)
@@ -198,11 +217,10 @@ static int acpi_unbind_one(struct device *dev)
         acpi_status status;
         struct list_head *node, *next;
 
-        if (!dev->archdata.acpi_handle)
+        if (!ACPI_HANDLE(dev))
                 return 0;
 
-        status = acpi_bus_get_device(dev->archdata.acpi_handle,
-                &acpi_dev);
+        status = acpi_bus_get_device(ACPI_HANDLE(dev), &acpi_dev);
         if (ACPI_FAILURE(status))
                 goto err;
 
@@ -228,7 +246,7 @@ static int acpi_unbind_one(struct device *dev)
 
                 sysfs_remove_link(&acpi_dev->dev.kobj, physical_node_name);
                 sysfs_remove_link(&dev->kobj, "firmware_node");
-                dev->archdata.acpi_handle = NULL;
+                ACPI_HANDLE_SET(dev, NULL);
                 /* acpi_bind_one increase refcnt by one */
                 put_device(dev);
                 kfree(entry);
@@ -248,6 +266,10 @@ static int acpi_platform_notify(struct device *dev)
         acpi_handle handle;
         int ret = -EINVAL;
 
+        ret = acpi_bind_one(dev, NULL);
+        if (!ret)
+                goto out;
+
         if (!dev->bus || !dev->parent) {
                 /* bridge devices genernally haven't bus or parent */
                 ret = acpi_find_bridge_device(dev, &handle);
@@ -261,16 +283,16 @@ static int acpi_platform_notify(struct device *dev)
         }
         if ((ret = type->find_device(dev, &handle)) != 0)
                 DBG("Can't get handler for %s\n", dev_name(dev));
-      end:
+ end:
         if (!ret)
                 acpi_bind_one(dev, handle);
 
+ out:
 #if ACPI_GLUE_DEBUG
         if (!ret) {
                 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
-                acpi_get_name(dev->archdata.acpi_handle,
-                              ACPI_FULL_PATHNAME, &buffer);
+                acpi_get_name(dev->acpi_handle, ACPI_FULL_PATHNAME, &buffer);
                 DBG("Device %s -> %s\n", dev_name(dev), (char *)buffer.pointer);
                 kfree(buffer.pointer);
         } else
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 509dcaa17555..3c407cdc1ec1 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -93,4 +93,11 @@ static inline int suspend_nvs_save(void) { return 0; }
 static inline void suspend_nvs_restore(void) {}
 #endif
 
+/*--------------------------------------------------------------------------
+                                Platform bus support
+  -------------------------------------------------------------------------- */
+struct platform_device;
+
+struct platform_device *acpi_create_platform_device(struct acpi_device *adev);
+
 #endif /* _ACPI_INTERNAL_H_ */
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index f2c3d74af23e..23a032490130 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -495,11 +495,6 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
         return 0;
 }
 
-/* FIXME: implement x86/x86_64 version */
-void __attribute__ ((weak)) acpi_unregister_gsi(u32 i)
-{
-}
-
 void acpi_pci_irq_disable(struct pci_dev *dev)
 {
         struct acpi_prt_entry *entry;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index e8086c725305..f1a5da44591d 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -735,31 +735,18 @@ static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx)
 static int acpi_idle_enter_c1(struct cpuidle_device *dev,
                 struct cpuidle_driver *drv, int index)
 {
-        ktime_t  kt1, kt2;
-        s64 idle_time;
         struct acpi_processor *pr;
         struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
         struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
 
         pr = __this_cpu_read(processors);
-        dev->last_residency = 0;
 
         if (unlikely(!pr))
                 return -EINVAL;
 
-        local_irq_disable();
-
-
         lapic_timer_state_broadcast(pr, cx, 1);
-        kt1 = ktime_get_real();
         acpi_idle_do_entry(cx);
-        kt2 = ktime_get_real();
-        idle_time =  ktime_to_us(ktime_sub(kt2, kt1));
-
-        /* Update device last_residency*/
-        dev->last_residency = (int)idle_time;
 
-        local_irq_enable();
         lapic_timer_state_broadcast(pr, cx, 0);
 
         return index;
@@ -806,19 +793,12 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         struct acpi_processor *pr;
         struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
         struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
-        ktime_t  kt1, kt2;
-        s64 idle_time_ns;
-        s64 idle_time;
 
         pr = __this_cpu_read(processors);
-        dev->last_residency = 0;
 
         if (unlikely(!pr))
                 return -EINVAL;
 
-        local_irq_disable();
-
-
         if (cx->entry_method != ACPI_CSTATE_FFH) {
                 current_thread_info()->status &= ~TS_POLLING;
                 /*
@@ -829,7 +809,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
 
                 if (unlikely(need_resched())) {
                         current_thread_info()->status |= TS_POLLING;
-                        local_irq_enable();
                         return -EINVAL;
                 }
         }
@@ -843,22 +822,12 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         if (cx->type == ACPI_STATE_C3)
                 ACPI_FLUSH_CPU_CACHE();
 
-        kt1 = ktime_get_real();
         /* Tell the scheduler that we are going deep-idle: */
         sched_clock_idle_sleep_event();
         acpi_idle_do_entry(cx);
-        kt2 = ktime_get_real();
-        idle_time_ns = ktime_to_ns(ktime_sub(kt2, kt1));
-        idle_time = idle_time_ns;
-        do_div(idle_time, NSEC_PER_USEC);
 
-        /* Update device last_residency*/
-        dev->last_residency = (int)idle_time;
+        sched_clock_idle_wakeup_event(0);
 
-        /* Tell the scheduler how much we idled: */
-        sched_clock_idle_wakeup_event(idle_time_ns);
-
-        local_irq_enable();
         if (cx->entry_method != ACPI_CSTATE_FFH)
                 current_thread_info()->status |= TS_POLLING;
 
@@ -883,13 +852,8 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
         struct acpi_processor *pr;
         struct cpuidle_state_usage *state_usage = &dev->states_usage[index];
         struct acpi_processor_cx *cx = cpuidle_get_statedata(state_usage);
-        ktime_t  kt1, kt2;
-        s64 idle_time_ns;
-        s64 idle_time;
-
 
         pr = __this_cpu_read(processors);
-        dev->last_residency = 0;
 
         if (unlikely(!pr))
                 return -EINVAL;
@@ -899,16 +863,11 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                         return drv->states[drv->safe_state_index].enter(dev,
                                                 drv, drv->safe_state_index);
                 } else {
-                        local_irq_disable();
                         acpi_safe_halt();
-                        local_irq_enable();
                         return -EBUSY;
                 }
         }
 
-        local_irq_disable();
-
-
         if (cx->entry_method != ACPI_CSTATE_FFH) {
                 current_thread_info()->status &= ~TS_POLLING;
                 /*
@@ -919,7 +878,6 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
 
                 if (unlikely(need_resched())) {
                         current_thread_info()->status |= TS_POLLING;
-                        local_irq_enable();
                         return -EINVAL;
                 }
         }
@@ -934,7 +892,6 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
          */
         lapic_timer_state_broadcast(pr, cx, 1);
 
-        kt1 = ktime_get_real();
         /*
          * disable bus master
          * bm_check implies we need ARB_DIS
@@ -965,18 +922,9 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                 c3_cpu_count--;
                 raw_spin_unlock(&c3_lock);
         }
-        kt2 = ktime_get_real();
-        idle_time_ns = ktime_to_ns(ktime_sub(kt2, kt1));
-        idle_time = idle_time_ns;
-        do_div(idle_time, NSEC_PER_USEC);
-
-        /* Update device last_residency*/
-        dev->last_residency = (int)idle_time;
 
-        /* Tell the scheduler how much we idled: */
-        sched_clock_idle_wakeup_event(idle_time_ns);
+        sched_clock_idle_wakeup_event(0);
 
-        local_irq_enable();
         if (cx->entry_method != ACPI_CSTATE_FFH)
                 current_thread_info()->status |= TS_POLLING;
 
@@ -987,6 +935,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
 struct cpuidle_driver acpi_idle_driver = {
         .name =         "acpi_idle",
         .owner =        THIS_MODULE,
+        .en_core_tk_irqen = 1,
 };
 
 /**
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
new file mode 100644
index 000000000000..a3868f6c222a
--- /dev/null
+++ b/drivers/acpi/resource.c
@@ -0,0 +1,526 @@
+/*
+ * drivers/acpi/resource.c - ACPI device resources interpretation.
+ *
+ * Copyright (C) 2012, Intel Corp.
+ * Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+
+#include <linux/acpi.h>
+#include <linux/device.h>
+#include <linux/export.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+
+#ifdef CONFIG_X86
+#define valid_IRQ(i) (((i) != 0) && ((i) != 2))
+#else
+#define valid_IRQ(i) (true)
+#endif
+
+static unsigned long acpi_dev_memresource_flags(u64 len, u8 write_protect,
+                                                bool window)
+{
+        unsigned long flags = IORESOURCE_MEM;
+
+        if (len == 0)
+                flags |= IORESOURCE_DISABLED;
+
+        if (write_protect == ACPI_READ_WRITE_MEMORY)
+                flags |= IORESOURCE_MEM_WRITEABLE;
+
+        if (window)
+                flags |= IORESOURCE_WINDOW;
+
+        return flags;
+}
+
+static void acpi_dev_get_memresource(struct resource *res, u64 start, u64 len,
+                                     u8 write_protect)
+{
+        res->start = start;
+        res->end = start + len - 1;
+        res->flags = acpi_dev_memresource_flags(len, write_protect, false);
+}
+
+/**
+ * acpi_dev_resource_memory - Extract ACPI memory resource information.
+ * @ares: Input ACPI resource object.
+ * @res: Output generic resource object.
+ *
+ * Check if the given ACPI resource object represents a memory resource and
+ * if that's the case, use the information in it to populate the generic
+ * resource object pointed to by @res.
+ */
+bool acpi_dev_resource_memory(struct acpi_resource *ares, struct resource *res)
+{
+        struct acpi_resource_memory24 *memory24;
+        struct acpi_resource_memory32 *memory32;
+        struct acpi_resource_fixed_memory32 *fixed_memory32;
+
+        switch (ares->type) {
+        case ACPI_RESOURCE_TYPE_MEMORY24:
+                memory24 = &ares->data.memory24;
+                acpi_dev_get_memresource(res, memory24->minimum,
+                                         memory24->address_length,
+                                         memory24->write_protect);
+                break;
+        case ACPI_RESOURCE_TYPE_MEMORY32:
+                memory32 = &ares->data.memory32;
+                acpi_dev_get_memresource(res, memory32->minimum,
+                                         memory32->address_length,
+                                         memory32->write_protect);
+                break;
+        case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
+                fixed_memory32 = &ares->data.fixed_memory32;
+                acpi_dev_get_memresource(res, fixed_memory32->address,
+                                         fixed_memory32->address_length,
+                                         fixed_memory32->write_protect);
+                break;
+        default:
+                return false;
+        }
+        return true;
+}
+EXPORT_SYMBOL_GPL(acpi_dev_resource_memory);
+
+static unsigned int acpi_dev_ioresource_flags(u64 start, u64 end, u8 io_decode,
+                                              bool window)
+{
+        int flags = IORESOURCE_IO;
+
+        if (io_decode == ACPI_DECODE_16)
+                flags |= IORESOURCE_IO_16BIT_ADDR;
+
+        if (start > end || end >= 0x10003)
+                flags |= IORESOURCE_DISABLED;
+
+        if (window)
+                flags |= IORESOURCE_WINDOW;
+
+        return flags;
+}
+
+static void acpi_dev_get_ioresource(struct resource *res, u64 start, u64 len,
+                                    u8 io_decode)
+{
+        u64 end = start + len - 1;
+
+        res->start = start;
+        res->end = end;
+        res->flags = acpi_dev_ioresource_flags(start, end, io_decode, false);
+}
+
+/**
+ * acpi_dev_resource_io - Extract ACPI I/O resource information.
+ * @ares: Input ACPI resource object.
+ * @res: Output generic resource object.
+ *
+ * Check if the given ACPI resource object represents an I/O resource and
+ * if that's the case, use the information in it to populate the generic
+ * resource object pointed to by @res.
+ */
+bool acpi_dev_resource_io(struct acpi_resource *ares, struct resource *res)
+{
+        struct acpi_resource_io *io;
+        struct acpi_resource_fixed_io *fixed_io;
+
+        switch (ares->type) {
+        case ACPI_RESOURCE_TYPE_IO:
+                io = &ares->data.io;
+                acpi_dev_get_ioresource(res, io->minimum,
+                                        io->address_length,
+                                        io->io_decode);
+                break;
+        case ACPI_RESOURCE_TYPE_FIXED_IO:
+                fixed_io = &ares->data.fixed_io;
+                acpi_dev_get_ioresource(res, fixed_io->address,
+                                        fixed_io->address_length,
+                                        ACPI_DECODE_10);
+                break;
+        default:
+                return false;
+        }
+        return true;
+}
+EXPORT_SYMBOL_GPL(acpi_dev_resource_io);
+
+/**
+ * acpi_dev_resource_address_space - Extract ACPI address space information.
+ * @ares: Input ACPI resource object.
+ * @res: Output generic resource object.
+ *
+ * Check if the given ACPI resource object represents an address space resource
+ * and if that's the case, use the information in it to populate the generic
+ * resource object pointed to by @res.
+ */
+bool acpi_dev_resource_address_space(struct acpi_resource *ares,
+                                     struct resource *res)
+{
+        acpi_status status;
+        struct acpi_resource_address64 addr;
+        bool window;
+        u64 len;
+        u8 io_decode;
+
+        switch (ares->type) {
+        case ACPI_RESOURCE_TYPE_ADDRESS16:
+        case ACPI_RESOURCE_TYPE_ADDRESS32:
+        case ACPI_RESOURCE_TYPE_ADDRESS64:
+                break;
+        default:
+                return false;
+        }
+
+        status = acpi_resource_to_address64(ares, &addr);
+        if (ACPI_FAILURE(status))
+                return true;
+
+        res->start = addr.minimum;
+        res->end = addr.maximum;
+        window = addr.producer_consumer == ACPI_PRODUCER;
+
+        switch(addr.resource_type) {
+        case ACPI_MEMORY_RANGE:
+                len = addr.maximum - addr.minimum + 1;
+                res->flags = acpi_dev_memresource_flags(len,
+                                                addr.info.mem.write_protect,
+                                                window);
+                break;
+        case ACPI_IO_RANGE:
+                io_decode = addr.granularity == 0xfff ?
+                                ACPI_DECODE_10 : ACPI_DECODE_16;
+                res->flags = acpi_dev_ioresource_flags(addr.minimum,
+                                                       addr.maximum,
+                                                       io_decode, window);
+                break;
+        case ACPI_BUS_NUMBER_RANGE:
+                res->flags = IORESOURCE_BUS;
+                break;
+        default:
+                res->flags = 0;
+        }
+
+        return true;
+}
+EXPORT_SYMBOL_GPL(acpi_dev_resource_address_space);
+
+/**
+ * acpi_dev_resource_ext_address_space - Extract ACPI address space information.
+ * @ares: Input ACPI resource object.
+ * @res: Output generic resource object.
+ *
+ * Check if the given ACPI resource object represents an extended address space
+ * resource and if that's the case, use the information in it to populate the
+ * generic resource object pointed to by @res.
+ */
+bool acpi_dev_resource_ext_address_space(struct acpi_resource *ares,
+                                         struct resource *res)
+{
+        struct acpi_resource_extended_address64 *ext_addr;
+        bool window;
+        u64 len;
+        u8 io_decode;
+
+        if (ares->type != ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64)
+                return false;
+
+        ext_addr = &ares->data.ext_address64;
+
+        res->start = ext_addr->minimum;
+        res->end = ext_addr->maximum;
+        window = ext_addr->producer_consumer == ACPI_PRODUCER;
+
+        switch(ext_addr->resource_type) {
+        case ACPI_MEMORY_RANGE:
+                len = ext_addr->maximum - ext_addr->minimum + 1;
+                res->flags = acpi_dev_memresource_flags(len,
+                                        ext_addr->info.mem.write_protect,
+                                        window);
+                break;
+        case ACPI_IO_RANGE:
+                io_decode = ext_addr->granularity == 0xfff ?
+                                ACPI_DECODE_10 : ACPI_DECODE_16;
+                res->flags = acpi_dev_ioresource_flags(ext_addr->minimum,
+                                                       ext_addr->maximum,
+                                                       io_decode, window);
+                break;
+        case ACPI_BUS_NUMBER_RANGE:
+                res->flags = IORESOURCE_BUS;
+                break;
+        default:
+                res->flags = 0;
+        }
+
+        return true;
+}
+EXPORT_SYMBOL_GPL(acpi_dev_resource_ext_address_space);
+
+/**
+ * acpi_dev_irq_flags - Determine IRQ resource flags.
+ * @triggering: Triggering type as provided by ACPI.
+ * @polarity: Interrupt polarity as provided by ACPI.
+ * @shareable: Whether or not the interrupt is shareable.
+ */
+unsigned long acpi_dev_irq_flags(u8 triggering, u8 polarity, u8 shareable)
+{
+        unsigned long flags;
+
+        if (triggering == ACPI_LEVEL_SENSITIVE)
+                flags = polarity == ACPI_ACTIVE_LOW ?
+                        IORESOURCE_IRQ_LOWLEVEL : IORESOURCE_IRQ_HIGHLEVEL;
+        else
+                flags = polarity == ACPI_ACTIVE_LOW ?
+                        IORESOURCE_IRQ_LOWEDGE : IORESOURCE_IRQ_HIGHEDGE;
+
+        if (shareable == ACPI_SHARED)
+                flags |= IORESOURCE_IRQ_SHAREABLE;
+
+        return flags | IORESOURCE_IRQ;
+}
+EXPORT_SYMBOL_GPL(acpi_dev_irq_flags);
+
+static void acpi_dev_irqresource_disabled(struct resource *res, u32 gsi)
+{
+        res->start = gsi;
+        res->end = gsi;
+        res->flags = IORESOURCE_IRQ | IORESOURCE_DISABLED;
+}
+
+static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
+                                     u8 triggering, u8 polarity, u8 shareable)
+{
+        int irq, p, t;
+
+        if (!valid_IRQ(gsi)) {
+                acpi_dev_irqresource_disabled(res, gsi);
+                return;
+        }
+
+        /*
+         * In IO-APIC mode, use overrided attribute. Two reasons:
+         * 1. BIOS bug in DSDT
+         * 2. BIOS uses IO-APIC mode Interrupt Source Override
+         */
+        if (!acpi_get_override_irq(gsi, &t, &p)) {
+                u8 trig = t ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE;
+                u8 pol = p ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH;
+
+                if (triggering != trig || polarity != pol) {
+                        pr_warning("ACPI: IRQ %d override to %s, %s\n", gsi,
+                                   t ? "edge" : "level", p ? "low" : "high");
+                        triggering = trig;
+                        polarity = pol;
+                }
+        }
+
+        res->flags = acpi_dev_irq_flags(triggering, polarity, shareable);
+        irq = acpi_register_gsi(NULL, gsi, triggering, polarity);
+        if (irq >= 0) {
+                res->start = irq;
+                res->end = irq;
+        } else {
+                acpi_dev_irqresource_disabled(res, gsi);
+        }
+}
+
+/**
+ * acpi_dev_resource_interrupt - Extract ACPI interrupt resource information.
+ * @ares: Input ACPI resource object.
+ * @index: Index into the array of GSIs represented by the resource.
+ * @res: Output generic resource object.
+ *
+ * Check if the given ACPI resource object represents an interrupt resource
+ * and @index does not exceed the resource's interrupt count (true is returned
+ * in that case regardless of the results of the other checks)).  If that's the
+ * case, register the GSI corresponding to @index from the array of interrupts
+ * represented by the resource and populate the generic resource object pointed
+ * to by @res accordingly.  If the registration of the GSI is not successful,
+ * IORESOURCE_DISABLED will be set it that object's flags.
+ */
+bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,
+                                 struct resource *res)
+{
+        struct acpi_resource_irq *irq;
+        struct acpi_resource_extended_irq *ext_irq;
+
+        switch (ares->type) {
+        case ACPI_RESOURCE_TYPE_IRQ:
+                /*
+                 * Per spec, only one interrupt per descriptor is allowed in
+                 * _CRS, but some firmware violates this, so parse them all.
+                 */
+                irq = &ares->data.irq;
+                if (index >= irq->interrupt_count) {
+                        acpi_dev_irqresource_disabled(res, 0);
+                        return false;
+                }
+                acpi_dev_get_irqresource(res, irq->interrupts[index],
+                                         irq->triggering, irq->polarity,
+                                         irq->sharable);
+                break;
+        case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
+                ext_irq = &ares->data.extended_irq;
+                if (index >= ext_irq->interrupt_count) {
+                        acpi_dev_irqresource_disabled(res, 0);
+                        return false;
+                }
+                acpi_dev_get_irqresource(res, ext_irq->interrupts[index],
+                                         ext_irq->triggering, ext_irq->polarity,
+                                         ext_irq->sharable);
+                break;
+        default:
+                return false;
+        }
+
+        return true;
+}
+EXPORT_SYMBOL_GPL(acpi_dev_resource_interrupt);
+
+/**
+ * acpi_dev_free_resource_list - Free resource from %acpi_dev_get_resources().
+ * @list: The head of the resource list to free.
+ */
+void acpi_dev_free_resource_list(struct list_head *list)
+{
+        struct resource_list_entry *rentry, *re;
+
+        list_for_each_entry_safe(rentry, re, list, node) {
+                list_del(&rentry->node);
+                kfree(rentry);
+        }
+}
+EXPORT_SYMBOL_GPL(acpi_dev_free_resource_list);
+
+struct res_proc_context {
+        struct list_head *list;
+        int (*preproc)(struct acpi_resource *, void *);
+        void *preproc_data;
+        int count;
+        int error;
+};
+
+static acpi_status acpi_dev_new_resource_entry(struct resource *r,
+                                               struct res_proc_context *c)
+{
+        struct resource_list_entry *rentry;
+
+        rentry = kmalloc(sizeof(*rentry), GFP_KERNEL);
+        if (!rentry) {
+                c->error = -ENOMEM;
+                return AE_NO_MEMORY;
+        }
+        rentry->res = *r;
+        list_add_tail(&rentry->node, c->list);
+        c->count++;
+        return AE_OK;
+}
+
+static acpi_status acpi_dev_process_resource(struct acpi_resource *ares,
+                                             void *context)
+{
+        struct res_proc_context *c = context;
+        struct resource r;
+        int i;
+
+        if (c->preproc) {
+                int ret;
+
+                ret = c->preproc(ares, c->preproc_data);
+                if (ret < 0) {
+                        c->error = ret;
+                        return AE_CTRL_TERMINATE;
+                } else if (ret > 0) {
+                        return AE_OK;
+                }
+        }
+
+        memset(&r, 0, sizeof(r));
+
+        if (acpi_dev_resource_memory(ares, &r)
+            || acpi_dev_resource_io(ares, &r)
+            || acpi_dev_resource_address_space(ares, &r)
+            || acpi_dev_resource_ext_address_space(ares, &r))
+                return acpi_dev_new_resource_entry(&r, c);
+
+        for (i = 0; acpi_dev_resource_interrupt(ares, i, &r); i++) {
+                acpi_status status;
+
+                status = acpi_dev_new_resource_entry(&r, c);
+                if (ACPI_FAILURE(status))
+                        return status;
+        }
+
+        return AE_OK;
+}
+
+/**
+ * acpi_dev_get_resources - Get current resources of a device.
+ * @adev: ACPI device node to get the resources for.
+ * @list: Head of the resultant list of resources (must be empty).
+ * @preproc: The caller's preprocessing routine.
+ * @preproc_data: Pointer passed to the caller's preprocessing routine.
+ *
+ * Evaluate the _CRS method for the given device node and process its output by
+ * (1) executing the @preproc() rountine provided by the caller, passing the
+ * resource pointer and @preproc_data to it as arguments, for each ACPI resource
+ * returned and (2) converting all of the returned ACPI resources into struct
+ * resource objects if possible.  If the return value of @preproc() in step (1)
+ * is different from 0, step (2) is not applied to the given ACPI resource and
+ * if that value is negative, the whole processing is aborted and that value is
+ * returned as the final error code.
+ *
+ * The resultant struct resource objects are put on the list pointed to by
+ * @list, that must be empty initially, as members of struct resource_list_entry
+ * objects.  Callers of this routine should use %acpi_dev_free_resource_list() to
+ * free that list.
+ *
+ * The number of resources in the output list is returned on success, an error
+ * code reflecting the error condition is returned otherwise.
+ */
+int acpi_dev_get_resources(struct acpi_device *adev, struct list_head *list,
+                           int (*preproc)(struct acpi_resource *, void *),
+                           void *preproc_data)
+{
+        struct res_proc_context c;
+        acpi_handle not_used;
+        acpi_status status;
+
+        if (!adev || !adev->handle || !list_empty(list))
+                return -EINVAL;
+
+        status = acpi_get_handle(adev->handle, METHOD_NAME__CRS, &not_used);
+        if (ACPI_FAILURE(status))
+                return 0;
+
+        c.list = list;
+        c.preproc = preproc;
+        c.preproc_data = preproc_data;
+        c.count = 0;
+        c.error = 0;
+        status = acpi_walk_resources(adev->handle, METHOD_NAME__CRS,
+                                     acpi_dev_process_resource, &c);
+        if (ACPI_FAILURE(status)) {
+                acpi_dev_free_resource_list(list);
+                return c.error ? c.error : -EIO;
+        }
+
+        return c.count;
+}
+EXPORT_SYMBOL_GPL(acpi_dev_get_resources);
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index d0b38ab47ab5..67a7fa638f7f 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -29,6 +29,17 @@ extern struct acpi_device *acpi_root;
 
 static const char *dummy_hid = "device";
 
+/*
+ * The following ACPI IDs are known to be suitable for representing as
+ * platform devices.
+ */
+static const struct acpi_device_id acpi_platform_device_ids[] = {
+
+        { "PNP0D40" },
+
+        { }
+};
+
 static LIST_HEAD(acpi_device_list);
 static LIST_HEAD(acpi_bus_id_list);
 DEFINE_MUTEX(acpi_device_lock);
@@ -397,8 +408,8 @@ static void acpi_device_remove_files(struct acpi_device *dev)
                         ACPI Bus operations
    -------------------------------------------------------------------------- */
 
-int acpi_match_device_ids(struct acpi_device *device,
-                          const struct acpi_device_id *ids)
+static const struct acpi_device_id *__acpi_match_device(
+        struct acpi_device *device, const struct acpi_device_id *ids)
 {
         const struct acpi_device_id *id;
         struct acpi_hardware_id *hwid;
@@ -408,14 +419,44 @@ int acpi_match_device_ids(struct acpi_device *device,
          * driver for it.
          */
         if (!device->status.present)
-                return -ENODEV;
+                return NULL;
 
         for (id = ids; id->id[0]; id++)
                 list_for_each_entry(hwid, &device->pnp.ids, list)
                         if (!strcmp((char *) id->id, hwid->id))
-                                return 0;
+                                return id;
+
+        return NULL;
+}
+
+/**
+ * acpi_match_device - Match a struct device against a given list of ACPI IDs
+ * @ids: Array of struct acpi_device_id object to match against.
+ * @dev: The device structure to match.
+ *
+ * Check if @dev has a valid ACPI handle and if there is a struct acpi_device
+ * object for that handle and use that object to match against a given list of
+ * device IDs.
+ *
+ * Return a pointer to the first matching ID on success or %NULL on failure.
+ */
+const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
+                                               const struct device *dev)
+{
+        struct acpi_device *adev;
 
-        return -ENOENT;
+        if (!ids || !ACPI_HANDLE(dev)
+            || ACPI_FAILURE(acpi_bus_get_device(ACPI_HANDLE(dev), &adev)))
+                return NULL;
+
+        return __acpi_match_device(adev, ids);
+}
+EXPORT_SYMBOL_GPL(acpi_match_device);
+
+int acpi_match_device_ids(struct acpi_device *device,
+                          const struct acpi_device_id *ids)
+{
+        return __acpi_match_device(device, ids) ? 0 : -ENOENT;
 }
 EXPORT_SYMBOL(acpi_match_device_ids);
 
@@ -1023,8 +1064,10 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
                  * D3hot is only valid if _PR3 present.
                  */
                 if (ps->resources.count ||
-                    (ps->flags.explicit_set && i < ACPI_STATE_D3_HOT))
+                    (ps->flags.explicit_set && i < ACPI_STATE_D3_HOT)) {
                         ps->flags.valid = 1;
+                        ps->flags.os_accessible = 1;
+                }
 
                 ps->power = -1; /* Unknown - driver assigned */
                 ps->latency = -1;       /* Unknown - driver assigned */
@@ -1040,6 +1083,11 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
         if (device->power.states[ACPI_STATE_D3_HOT].flags.explicit_set)
                 device->power.states[ACPI_STATE_D3_COLD].flags.explicit_set = 1;
 
+        /* Presence of _PS3 or _PRx means we can put the device into D3 cold */
+        if (device->power.states[ACPI_STATE_D3_HOT].flags.explicit_set ||
+                        device->power.flags.power_resources)
+                device->power.states[ACPI_STATE_D3_COLD].flags.os_accessible = 1;
+
         acpi_bus_init_power(device);
 
         return 0;
@@ -1238,7 +1286,7 @@ static void acpi_device_set_id(struct acpi_device *device)
 {
         acpi_status status;
         struct acpi_device_info *info;
-        struct acpica_device_id_list *cid_list;
+        struct acpi_pnp_device_id_list *cid_list;
         int i;
 
         switch (device->device_type) {
@@ -1539,8 +1587,13 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl,
          */
         device = NULL;
         acpi_bus_get_device(handle, &device);
-        if (ops->acpi_op_add && !device)
+        if (ops->acpi_op_add && !device) {
                 acpi_add_single_object(&device, handle, type, sta, ops);
+                /* Is the device a known good platform device? */
+                if (device
+                    && !acpi_match_device_ids(device, acpi_platform_device_ids))
+                        acpi_create_platform_device(device);
+        }
 
         if (!device)
                 return AE_CTRL_DEPTH;
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 6efef87b405c..2fcc67d34b11 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -18,7 +18,6 @@
 #include <linux/reboot.h>
 #include <linux/acpi.h>
 #include <linux/module.h>
-#include <linux/pm_runtime.h>
 
 #include <asm/io.h>
 
@@ -81,6 +80,12 @@ static int acpi_sleep_prepare(u32 acpi_state)
 
 #ifdef CONFIG_ACPI_SLEEP
 static u32 acpi_target_sleep_state = ACPI_STATE_S0;
+
+u32 acpi_target_system_state(void)
+{
+        return acpi_target_sleep_state;
+}
+
 static bool pwr_btn_event_pending;
 
 /*
@@ -710,177 +715,6 @@ int acpi_suspend(u32 acpi_state)
         return -EINVAL;
 }
 
-#ifdef CONFIG_PM
-/**
- *      acpi_pm_device_sleep_state - return preferred power state of ACPI device
- *              in the system sleep state given by %acpi_target_sleep_state
- *      @dev: device to examine; its driver model wakeup flags control
- *              whether it should be able to wake up the system
- *      @d_min_p: used to store the upper limit of allowed states range
- *      @d_max_in: specify the lowest allowed states
- *      Return value: preferred power state of the device on success, -ENODEV
- *      (ie. if there's no 'struct acpi_device' for @dev) or -EINVAL on failure
- *
- *      Find the lowest power (highest number) ACPI device power state that
- *      device @dev can be in while the system is in the sleep state represented
- *      by %acpi_target_sleep_state.  If @wake is nonzero, the device should be
- *      able to wake up the system from this sleep state.  If @d_min_p is set,
- *      the highest power (lowest number) device power state of @dev allowed
- *      in this system sleep state is stored at the location pointed to by it.
- *
- *      The caller must ensure that @dev is valid before using this function.
- *      The caller is also responsible for figuring out if the device is
- *      supposed to be able to wake up the system and passing this information
- *      via @wake.
- */
-
-int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p, int d_max_in)
-{
-        acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
-        struct acpi_device *adev;
-        char acpi_method[] = "_SxD";
-        unsigned long long d_min, d_max;
-
-        if (d_max_in < ACPI_STATE_D0 || d_max_in > ACPI_STATE_D3)
-                return -EINVAL;
-        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
-                printk(KERN_DEBUG "ACPI handle has no context!\n");
-                return -ENODEV;
-        }
-
-        acpi_method[2] = '0' + acpi_target_sleep_state;
-        /*
-         * If the sleep state is S0, the lowest limit from ACPI is D3,
-         * but if the device has _S0W, we will use the value from _S0W
-         * as the lowest limit from ACPI.  Finally, we will constrain
-         * the lowest limit with the specified one.
-         */
-        d_min = ACPI_STATE_D0;
-        d_max = ACPI_STATE_D3;
-
-        /*
-         * If present, _SxD methods return the minimum D-state (highest power
-         * state) we can use for the corresponding S-states.  Otherwise, the
-         * minimum D-state is D0 (ACPI 3.x).
-         *
-         * NOTE: We rely on acpi_evaluate_integer() not clobbering the integer
-         * provided -- that's our fault recovery, we ignore retval.
-         */
-        if (acpi_target_sleep_state > ACPI_STATE_S0)
-                acpi_evaluate_integer(handle, acpi_method, NULL, &d_min);
-
-        /*
-         * If _PRW says we can wake up the system from the target sleep state,
-         * the D-state returned by _SxD is sufficient for that (we assume a
-         * wakeup-aware driver if wake is set).  Still, if _SxW exists
-         * (ACPI 3.x), it should return the maximum (lowest power) D-state that
-         * can wake the system.  _S0W may be valid, too.
-         */
-        if (acpi_target_sleep_state == ACPI_STATE_S0 ||
-            (device_may_wakeup(dev) && adev->wakeup.flags.valid &&
-             adev->wakeup.sleep_state >= acpi_target_sleep_state)) {
-                acpi_status status;
-
-                acpi_method[3] = 'W';
-                status = acpi_evaluate_integer(handle, acpi_method, NULL,
-                                                &d_max);
-                if (ACPI_FAILURE(status)) {
-                        if (acpi_target_sleep_state != ACPI_STATE_S0 ||
-                            status != AE_NOT_FOUND)
-                                d_max = d_min;
-                } else if (d_max < d_min) {
-                        /* Warn the user of the broken DSDT */
-                        printk(KERN_WARNING "ACPI: Wrong value from %s\n",
-                                acpi_method);
-                        /* Sanitize it */
-                        d_min = d_max;
-                }
-        }
-
-        if (d_max_in < d_min)
-                return -EINVAL;
-        if (d_min_p)
-                *d_min_p = d_min;
-        /* constrain d_max with specified lowest limit (max number) */
-        if (d_max > d_max_in) {
-                for (d_max = d_max_in; d_max > d_min; d_max--) {
-                        if (adev->power.states[d_max].flags.valid)
-                                break;
-                }
-        }
-        return d_max;
-}
-EXPORT_SYMBOL(acpi_pm_device_sleep_state);
-#endif /* CONFIG_PM */
-
-#ifdef CONFIG_PM_SLEEP
-/**
- * acpi_pm_device_run_wake - Enable/disable wake-up for given device.
- * @phys_dev: Device to enable/disable the platform to wake-up the system for.
- * @enable: Whether enable or disable the wake-up functionality.
- *
- * Find the ACPI device object corresponding to @pci_dev and try to
- * enable/disable the GPE associated with it.
- */
-int acpi_pm_device_run_wake(struct device *phys_dev, bool enable)
-{
-        struct acpi_device *dev;
-        acpi_handle handle;
-
-        if (!device_run_wake(phys_dev))
-                return -EINVAL;
-
-        handle = DEVICE_ACPI_HANDLE(phys_dev);
-        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &dev))) {
-                dev_dbg(phys_dev, "ACPI handle has no context in %s!\n",
-                        __func__);
-                return -ENODEV;
-        }
-
-        if (enable) {
-                acpi_enable_wakeup_device_power(dev, ACPI_STATE_S0);
-                acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number);
-        } else {
-                acpi_disable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number);
-                acpi_disable_wakeup_device_power(dev);
-        }
-
-        return 0;
-}
-EXPORT_SYMBOL(acpi_pm_device_run_wake);
-
-/**
- *      acpi_pm_device_sleep_wake - enable or disable the system wake-up
- *                                  capability of given device
- *      @dev: device to handle
- *      @enable: 'true' - enable, 'false' - disable the wake-up capability
- */
-int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
-{
-        acpi_handle handle;
-        struct acpi_device *adev;
-        int error;
-
-        if (!device_can_wakeup(dev))
-                return -EINVAL;
-
-        handle = DEVICE_ACPI_HANDLE(dev);
-        if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {
-                dev_dbg(dev, "ACPI handle has no context in %s!\n", __func__);
-                return -ENODEV;
-        }
-
-        error = enable ?
-                acpi_enable_wakeup_device_power(adev, acpi_target_sleep_state) :
-                acpi_disable_wakeup_device_power(adev);
-        if (!error)
-                dev_info(dev, "wake-up capability %s by ACPI\n",
-                                enable ? "enabled" : "disabled");
-
-        return error;
-}
-#endif  /* CONFIG_PM_SLEEP */
-
 static void acpi_power_off_prepare(void)
 {
         /* Prepare to power off the system */
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 7c3f98ba4afe..ea61ca9129cd 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -476,7 +476,7 @@ static void fixed_event_count(u32 event_number)
         return;
 }
 
-static void acpi_gbl_event_handler(u32 event_type, acpi_handle device,
+static void acpi_global_event_handler(u32 event_type, acpi_handle device,
         u32 event_number, void *context)
 {
         if (event_type == ACPI_EVENT_TYPE_GPE)
@@ -638,7 +638,7 @@ void acpi_irq_stats_init(void)
         if (all_counters == NULL)
                 goto fail;
 
-        status = acpi_install_global_event_handler(acpi_gbl_event_handler, NULL);
+        status = acpi_install_global_event_handler(acpi_global_event_handler, NULL);
         if (ACPI_FAILURE(status))
                 goto fail;