ACPICA: Debug output: Fix a couple of small output issues.

1) Fix utcache to use the proper return macros in order to maintain
the function nesting level.

2) Enable the function nesting level for all ACPI applications instead
of just acpiexec.

Linux kernel behaviour is not affected by this patch as Linux doesn't
use ACPICA object cache mechanism currently.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/acpi/acpica/utcache.c b/drivers/acpi/acpica/utcache.c
index 366bfec4b770..cacd2fd9e665 100644
--- a/drivers/acpi/acpica/utcache.c
+++ b/drivers/acpi/acpica/utcache.c
@@ -248,12 +248,12 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
         ACPI_FUNCTION_NAME(os_acquire_object);
 
         if (!cache) {
-                return (NULL);
+                return_PTR(NULL);
         }
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);
         if (ACPI_FAILURE(status)) {
-                return (NULL);
+                return_PTR(NULL);
         }
 
         ACPI_MEM_TRACKING(cache->requests++);
@@ -276,7 +276,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
 
                 status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
                 if (ACPI_FAILURE(status)) {
-                        return (NULL);
+                        return_PTR(NULL);
                 }
 
                 /* Clear (zero) the previously used Object */
@@ -299,15 +299,15 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
 
                 status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
                 if (ACPI_FAILURE(status)) {
-                        return (NULL);
+                        return_PTR(NULL);
                 }
 
                 object = ACPI_ALLOCATE_ZEROED(cache->object_size);
                 if (!object) {
-                        return (NULL);
+                        return_PTR(NULL);
                 }
         }
 
-        return (object);
+        return_PTR(object);
 }
 #endif                          /* ACPI_USE_LOCAL_CACHE */
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index 03ae8affe48f..d971c8631263 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -194,9 +194,9 @@ acpi_debug_print(u32 requested_debug_level,
          */
         acpi_os_printf("%9s-%04ld ", module_name, line_number);
 
-#ifdef ACPI_EXEC_APP
+#ifdef ACPI_APPLICATION
         /*
-         * For acpi_exec only, emit the thread ID and nesting level.
+         * For acpi_exec/iASL only, emit the thread ID and nesting level.
          * Note: nesting level is really only useful during a single-thread
          * execution. Otherwise, multiple threads will keep resetting the
          * level.