Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[deliverable/linux.git] / drivers / acpi / acpica / evregion.c

diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 63924d1c737a0b303f999fa4de9f08cf5e12a89b..4c6f795140402a3d74231882cb67561fe0c15115 100644 (file)
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -526,81 +526,59 @@ acpi_ev_attach_region(union acpi_operand_object *handler_obj,
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_ev_associate_reg_method
+ * FUNCTION:    acpi_ev_execute_reg_method
  *
  * PARAMETERS:  region_obj          - Region object
+ *              function            - Passed to _REG: On (1) or Off (0)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Find and associate _REG method to a region
+ * DESCRIPTION: Execute _REG method for a region
  *
  ******************************************************************************/
 
-void acpi_ev_associate_reg_method(union acpi_operand_object *region_obj)
+acpi_status
+acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
 {
-       acpi_name *reg_name_ptr = (acpi_name *) METHOD_NAME__REG;
+       struct acpi_evaluate_info *info;
+       union acpi_operand_object *args[3];
+       union acpi_operand_object *region_obj2;
+       const acpi_name *reg_name_ptr =
+           ACPI_CAST_PTR(acpi_name, METHOD_NAME__REG);
        struct acpi_namespace_node *method_node;
        struct acpi_namespace_node *node;
-       union acpi_operand_object *region_obj2;
        acpi_status status;
 
-       ACPI_FUNCTION_TRACE(ev_associate_reg_method);
+       ACPI_FUNCTION_TRACE(ev_execute_reg_method);
+
+       if (!acpi_gbl_namespace_initialized ||
+           region_obj->region.handler == NULL) {
+               return_ACPI_STATUS(AE_OK);
+       }
 
        region_obj2 = acpi_ns_get_secondary_object(region_obj);
        if (!region_obj2) {
-               return_VOID;
+               return_ACPI_STATUS(AE_NOT_EXIST);
        }
 
+       /*
+        * Find any "_REG" method associated with this region definition.
+        * The method should always be updated as this function may be
+        * invoked after a namespace change.
+        */
        node = region_obj->region.node->parent;
-
-       /* Find any "_REG" method associated with this region definition */
-
        status =
            acpi_ns_search_one_scope(*reg_name_ptr, node, ACPI_TYPE_METHOD,
                                     &method_node);
        if (ACPI_SUCCESS(status)) {
                /*
-                * The _REG method is optional and there can be only one per region
-                * definition. This will be executed when the handler is attached
-                * or removed
+                * The _REG method is optional and there can be only one per
+                * region definition. This will be executed when the handler is
+                * attached or removed.
                 */
                region_obj2->extra.method_REG = method_node;
        }
-
-       return_VOID;
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_ev_execute_reg_method
- *
- * PARAMETERS:  region_obj          - Region object
- *              function            - Passed to _REG: On (1) or Off (0)
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Execute _REG method for a region
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
-{
-       struct acpi_evaluate_info *info;
-       union acpi_operand_object *args[3];
-       union acpi_operand_object *region_obj2;
-       acpi_status status;
-
-       ACPI_FUNCTION_TRACE(ev_execute_reg_method);
-
-       region_obj2 = acpi_ns_get_secondary_object(region_obj);
-       if (!region_obj2) {
-               return_ACPI_STATUS(AE_NOT_EXIST);
-       }
-
-       if (region_obj2->extra.method_REG == NULL ||
-           region_obj->region.handler == NULL ||
-           !acpi_gbl_namespace_initialized) {
+       if (region_obj2->extra.method_REG == NULL) {
                return_ACPI_STATUS(AE_OK);
        }