ACPI: utils: Clean up printing messages

Replace all of the ACPI_DEBUG_PRINT() instances in utils.c with
pr_debug() and acpi_handle_debug(), drop the _COMPONENT and
ACPI_MODULE_NAME() definitions that are not used any more and
replace direct printk() invocations with pr_debug() calls (the log
level in there is way excessive).

Also add a special pr_fmt() definition, but this only affects the
pr_debug() messages mentioned above.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index d5411a166685c8024bedc7ff1ef87f25632329af..cdbc6bf9e4efa09f927e9e8564f83c20fc878f68 100644 (file)
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -6,6 +6,8 @@
  *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
  */
 
+#define pr_fmt(fmt) "ACPI: utils: " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -18,24 +20,12 @@
 #include "internal.h"
 #include "sleep.h"
 
-#define _COMPONENT             ACPI_BUS_COMPONENT
-ACPI_MODULE_NAME("utils");
-
 /* --------------------------------------------------------------------------
                             Object Evaluation Helpers
    -------------------------------------------------------------------------- */
-static void
-acpi_util_eval_error(acpi_handle h, acpi_string p, acpi_status s)
+static void acpi_util_eval_error(acpi_handle h, acpi_string p, acpi_status s)
 {
-#ifdef ACPI_DEBUG_OUTPUT
-       char prefix[80] = {'\0'};
-       struct acpi_buffer buffer = {sizeof(prefix), prefix};
-       acpi_get_name(h, ACPI_FULL_PATHNAME, &buffer);
-       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluate [%s.%s]: %s\n",
-               (char *) prefix, p, acpi_format_exception(s)));
-#else
-       return;
-#endif
+       acpi_handle_debug(h, "Evaluate [%s]: %s\n", p, acpi_format_exception(s));
 }
 
 acpi_status
@@ -53,25 +43,24 @@ acpi_extract_package(union acpi_object *package,
 
        if (!package || (package->type != ACPI_TYPE_PACKAGE)
            || (package->package.count < 1)) {
-               printk(KERN_WARNING PREFIX "Invalid package argument\n");
+               pr_debug("Invalid package argument\n");
                return AE_BAD_PARAMETER;
        }
 
        if (!format || !format->pointer || (format->length < 1)) {
-               printk(KERN_WARNING PREFIX "Invalid format argument\n");
+               pr_debug("Invalid format argument\n");
                return AE_BAD_PARAMETER;
        }
 
        if (!buffer) {
-               printk(KERN_WARNING PREFIX "Invalid buffer argument\n");
+               pr_debug("Invalid buffer argument\n");
                return AE_BAD_PARAMETER;
        }
 
        format_count = (format->length / sizeof(char)) - 1;
        if (format_count > package->package.count) {
-               printk(KERN_WARNING PREFIX "Format specifies more objects [%d]"
-                             " than exist in package [%d].\n",
-                             format_count, package->package.count);
+               pr_debug("Format specifies more objects [%d] than present [%d]\n",
+                        format_count, package->package.count);
                return AE_BAD_DATA;
        }
 
@@ -99,10 +88,8 @@ acpi_extract_package(union acpi_object *package,
                                tail_offset += sizeof(char *);
                                break;
                        default:
-                               printk(KERN_WARNING PREFIX "Invalid package element"
-                                             " [%d]: got number, expecting"
-                                             " [%c]\n",
-                                             i, format_string[i]);
+                               pr_debug("Invalid package element [%d]: got number, expected [%c]\n",
+                                        i, format_string[i]);
                                return AE_BAD_DATA;
                        }
                        break;
@@ -123,10 +110,8 @@ acpi_extract_package(union acpi_object *package,
                                tail_offset += sizeof(u8 *);
                                break;
                        default:
-                               printk(KERN_WARNING PREFIX "Invalid package element"
-                                             " [%d] got string/buffer,"
-                                             " expecting [%c]\n",
-                                             i, format_string[i]);
+                               pr_debug("Invalid package element [%d] got string/buffer, expected [%c]\n",
+                                        i, format_string[i]);
                                return AE_BAD_DATA;
                        }
                        break;
@@ -137,19 +122,15 @@ acpi_extract_package(union acpi_object *package,
                                tail_offset += sizeof(void *);
                                break;
                        default:
-                               printk(KERN_WARNING PREFIX "Invalid package element"
-                                             " [%d] got reference,"
-                                             " expecting [%c]\n",
-                                             i, format_string[i]);
+                               pr_debug("Invalid package element [%d] got reference, expected [%c]\n",
+                                        i, format_string[i]);
                                return AE_BAD_DATA;
                        }
                        break;
 
                case ACPI_TYPE_PACKAGE:
                default:
-                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                         "Found unsupported element at index=%d\n",
-                                         i));
+                       pr_debug("Unsupported element at index=%d\n", i);
                        /* TBD: handle nested packages... */
                        return AE_SUPPORT;
                }
@@ -289,7 +270,7 @@ acpi_evaluate_integer(acpi_handle handle,
 
        *data = element.integer.value;
 
-       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%llu]\n", *data));
+       acpi_handle_debug(handle, "Return value [%llu]\n", *data);
 
        return AE_OK;
 }
@@ -363,8 +344,7 @@ acpi_evaluate_reference(acpi_handle handle,
                /* Get the  acpi_handle. */
 
                list->handles[i] = element->reference.handle;
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found reference [%p]\n",
-                                 list->handles[i]));
+               acpi_handle_debug(list->handles[i], "Found in reference list\n");
        }
 
       end: