ACPICA: Update error message, no functional change
authorBob Moore <robert.moore@intel.com>
Thu, 15 Feb 2018 21:09:27 +0000 (13:09 -0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 21 Feb 2018 22:51:08 +0000 (23:51 +0100)
ACPICA commit 0787fda3b224a78369e26ac6046658beb2b64c12

Clarify error when an attempt is made to evaluate things like
devices, events, etc. -- these objects have no data and cannot
be "evaluated".

Link: https://github.com/acpica/acpica/commit/0787fda3
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/acpica/nseval.c

index c2d883b..bdf94ec 100644 (file)
@@ -187,6 +187,7 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
         * 3) The object is not a method -- just return it's current value
         */
        switch (acpi_ns_get_type(info->node)) {
+       case ACPI_TYPE_ANY:
        case ACPI_TYPE_DEVICE:
        case ACPI_TYPE_EVENT:
        case ACPI_TYPE_MUTEX:
@@ -194,11 +195,12 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info *info)
        case ACPI_TYPE_THERMAL:
        case ACPI_TYPE_LOCAL_SCOPE:
                /*
-                * 1) Disallow evaluation of certain object types. For these,
-                *    object evaluation is undefined and not supported.
+                * 1) Disallow evaluation of these object types. For these,
+                *    object evaluation is undefined.
                 */
                ACPI_ERROR((AE_INFO,
-                           "%s: Evaluation of object type [%s] is not supported",
+                           "%s: This object type [%s] "
+                           "never contains data and cannot be evaluated",
                            info->full_pathname,
                            acpi_ut_get_type_name(info->node->type)));