Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6-omap-h63xx.git] / drivers / acpi / dispatcher / dsinit.c

diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c
index bbdf990e9f658c3ed9e08af3646e96244a0de844..daf51b5b5875fd4978b8926d80931a19134c9806 100644 (file)
--- a/drivers/acpi/dispatcher/dsinit.c
+++ b/drivers/acpi/dispatcher/dsinit.c
@@ -125,37 +125,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle,
                if (info->table_desc->pointer->revision == 1) {
                        node->flags |= ANOBJ_DATA_WIDTH_32;
                }
-#ifdef ACPI_INIT_PARSE_METHODS
-               /*
-                * Note 11/2005: Removed this code to parse all methods during table
-                * load because it causes problems if there are any errors during the
-                * parse. Also, it seems like overkill and we probably don't want to
-                * abort a table load because of an issue with a single method.
-                */
-
-               /*
-                * Print a dot for each method unless we are going to print
-                * the entire pathname
-                */
-               if (!(acpi_dbg_level & ACPI_LV_INIT_NAMES)) {
-                       ACPI_DEBUG_PRINT_RAW((ACPI_DB_INIT, "."));
-               }
 
-               /*
-                * Always parse methods to detect errors, we will delete
-                * the parse tree below
-                */
-               status = acpi_ds_parse_method(obj_handle);
-               if (ACPI_FAILURE(status)) {
-                       ACPI_ERROR((AE_INFO,
-                                   "Method %p [%4.4s] - parse failure, %s",
-                                   obj_handle,
-                                   acpi_ut_get_node_name(obj_handle),
-                                   acpi_format_exception(status)));
-
-                       /* This parse failed, but we will continue parsing more methods */
-               }
-#endif
                info->method_count++;
                break;