Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / acpi / utils.c

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index dd8ff63..cd49a39 100644 (file)
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -346,22 +346,16 @@ acpi_evaluate_reference(acpi_handle handle,
        package = buffer.pointer;
 
        if ((buffer.length == 0) || !package) {
-               printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",
-                           (unsigned)buffer.length, package);
                status = AE_BAD_DATA;
                acpi_util_eval_error(handle, pathname, status);
                goto end;
        }
        if (package->type != ACPI_TYPE_PACKAGE) {
-               printk(KERN_ERR PREFIX "Expecting a [Package], found type %X\n",
-                           package->type);
                status = AE_BAD_DATA;
                acpi_util_eval_error(handle, pathname, status);
                goto end;
        }
        if (!package->package.count) {
-               printk(KERN_ERR PREFIX "[Package] has zero elements (%p)\n",
-                           package);
                status = AE_BAD_DATA;
                acpi_util_eval_error(handle, pathname, status);
                goto end;
@@ -380,17 +374,13 @@ acpi_evaluate_reference(acpi_handle handle,
 
                if (element->type != ACPI_TYPE_LOCAL_REFERENCE) {
                        status = AE_BAD_DATA;
-                       printk(KERN_ERR PREFIX
-                                   "Expecting a [Reference] package element, found type %X\n",
-                                   element->type);
                        acpi_util_eval_error(handle, pathname, status);
                        break;
                }
 
                if (!element->reference.handle) {
-                       printk(KERN_WARNING PREFIX "Invalid reference in"
-                              " package %s\n", pathname);
                        status = AE_NULL_ENTRY;
+                       acpi_util_eval_error(handle, pathname, status);
                        break;
                }
                /* Get the  acpi_handle. */