Merge tag 'acpi-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[sfrench/cifs-2.6.git] / drivers / acpi / acpica / evrgnini.c

diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index 17df5dacd43cf2c1687c4b0d0cf02c414f1f4706..0b47bbcd2a2391925d2393dcadf12fd992c32971 100644 (file)
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -3,7 +3,7 @@
  *
  * Module Name: evrgnini- ACPI address_space (op_region) init
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -516,25 +516,6 @@ acpi_status acpi_ev_initialize_region(union acpi_operand_object *region_obj)
                                handler_obj = obj_desc->common_notify.handler;
                                break;
 
-                       case ACPI_TYPE_METHOD:
-                               /*
-                                * If we are executing module level code, the original
-                                * Node's object was replaced by this Method object and we
-                                * saved the handler in the method object.
-                                *
-                                * Note: Only used for the legacy MLC support. Will
-                                * be removed in the future.
-                                *
-                                * See acpi_ns_exec_module_code
-                                */
-                               if (!acpi_gbl_execute_tables_as_methods &&
-                                   obj_desc->method.
-                                   info_flags & ACPI_METHOD_MODULE_LEVEL) {
-                                       handler_obj =
-                                           obj_desc->method.dispatch.handler;
-                               }
-                               break;
-
                        default:
 
                                /* Ignore other objects */