[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-id: <e127770259e4341df0f83c3531f0df57982815e2.1223706853.git.len.brown@intel.com>
Date: Sat, 11 Oct 2008 02:36:35 -0400
From: Len Brown <lenb@...nel.org>
To: linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Thomas Renninger <trenn@...e.de>, Andi Kleen <ak@...ux.intel.com>,
Len Brown <len.brown@...el.com>
Subject: [PATCH 75/85] ACPI processor: Debug interface used for error message
cleanup
From: Thomas Renninger <trenn@...e.de>
Signed-off-by: Thomas Renninger <trenn@...e.de>
Signed-off-by: Andi Kleen <ak@...ux.intel.com>
Signed-off-by: Len Brown <len.brown@...el.com>
---
drivers/acpi/processor_perflib.c | 17 ++++++-----------
drivers/acpi/processor_throttling.c | 17 ++++++-----------
2 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 80c251e..bf183e7 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -523,14 +523,9 @@ static int acpi_processor_get_psd(struct acpi_processor *pr)
}
psd = buffer.pointer;
- if (!psd || (psd->type != ACPI_TYPE_PACKAGE)) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));
- result = -EFAULT;
- goto end;
- }
-
- if (psd->package.count != 1) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));
+ if (!psd || (psd->type != ACPI_TYPE_PACKAGE)
+ || psd->package.count != 1) {
+ printk(KERN_ERR "Invalid _PSD data\n");
result = -EFAULT;
goto end;
}
@@ -543,19 +538,19 @@ static int acpi_processor_get_psd(struct acpi_processor *pr)
status = acpi_extract_package(&(psd->package.elements[0]),
&format, &state);
if (ACPI_FAILURE(status)) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _PSD data\n"));
+ ACPI_EXCEPTION((AE_INFO, status, "Invalid _PSD data"));
result = -EFAULT;
goto end;
}
if (pdomain->num_entries != ACPI_PSD_REV0_ENTRIES) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown _PSD:num_entries\n"));
+ printk(KERN_ERR "Unknown _PSD:num_entries\n");
result = -EFAULT;
goto end;
}
if (pdomain->revision != ACPI_PSD_REV0_REVISION) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown _PSD:revision\n"));
+ printk(KERN_ERR "Unknown _PSD:revision\n");
result = -EFAULT;
goto end;
}
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index a56fc6c..ce4540d 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -527,14 +527,9 @@ static int acpi_processor_get_tsd(struct acpi_processor *pr)
}
tsd = buffer.pointer;
- if (!tsd || (tsd->type != ACPI_TYPE_PACKAGE)) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _TSD data\n"));
- result = -EFAULT;
- goto end;
- }
-
- if (tsd->package.count != 1) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _TSD data\n"));
+ if (!tsd || (tsd->type != ACPI_TYPE_PACKAGE)
+ || tsd->package.count != 1) {
+ printk(KERN_INFO "Invalid _TSD data\n");
result = -EFAULT;
goto end;
}
@@ -547,19 +542,19 @@ static int acpi_processor_get_tsd(struct acpi_processor *pr)
status = acpi_extract_package(&(tsd->package.elements[0]),
&format, &state);
if (ACPI_FAILURE(status)) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _TSD data\n"));
+ ACPI_EXCEPTION((AE_INFO, status, "Invalid _TSD data"));
result = -EFAULT;
goto end;
}
if (pdomain->num_entries != ACPI_TSD_REV0_ENTRIES) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown _TSD:num_entries\n"));
+ printk(KERN_ERR "Unknown _TSD:num_entries\n");
result = -EFAULT;
goto end;
}
if (pdomain->revision != ACPI_TSD_REV0_REVISION) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown _TSD:revision\n"));
+ printk(KERN_ERR "Unknown _TSD:revision\n");
result = -EFAULT;
goto end;
}
--
1.5.5.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists