[PATCH] acpi: method: remove extraneous "_" in error message

Colin King colin.king at canonical.com
Wed Jun 3 15:53:39 UTC 2015


From: Colin Ian King <colin.king at canonical.com>

We're seeing method error messages being reported in the form:

    Method__BCLElementCount: Test 165, \_SB_.PCI0.PEGP.DGFX.LCD_._BCL
    should return package of at least 3 elements, got 2 elements instead.

..there is an extra _ which is being added to the method name, so remove
it from the error message.

Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
 src/acpi/method/method.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
index c9bf6f9..cd2baa4 100644
--- a/src/acpi/method/method.c
+++ b/src/acpi/method/method.c
@@ -350,7 +350,7 @@ static int method_package_count_min(
 	if (obj->Package.Count < min) {
 		char tmp[128];
 
-		snprintf(tmp, sizeof(tmp), "Method_%sElementCount", objname);
+		snprintf(tmp, sizeof(tmp), "Method%sElementCount", objname);
 		fwts_failed(fw, LOG_LEVEL_MEDIUM, tmp,
 			"%s should return package of at least %" PRIu32
 			" element%s, got %" PRIu32 " element%s instead.",
@@ -375,7 +375,7 @@ static int method_package_count_equal(
 	if (obj->Package.Count != count) {
 		char tmp[128];
 
-		snprintf(tmp, sizeof(tmp), "Method_%sElementCount", objname);
+		snprintf(tmp, sizeof(tmp), "Method%sElementCount", objname);
 		fwts_failed(fw, LOG_LEVEL_MEDIUM, tmp,
 			"%s should return package of %" PRIu32
 			" element%s, got %" PRIu32 " element%s instead.",
-- 
2.1.4




More information about the fwts-devel mailing list