[PATCH] acpi: method: replace revision checks by fwts_method_test_revision
Alex Hung
alex.hung at canonical.com
Thu Dec 3 00:09:33 UTC 2020
Signed-off-by: Alex Hung <alex.hung at canonical.com>
---
src/acpi/method/method.c | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c
index a881b503..f486d756 100644
--- a/src/acpi/method/method.c
+++ b/src/acpi/method/method.c
@@ -1866,7 +1866,7 @@ static void method_test_CPC_return(
fwts_failed(fw, LOG_LEVEL_HIGH,
"Method_CPCBadRevision",
"_CPC's revision is incorrect, "
- "expecting 1 ,2 or 3, got 0x%" PRIx8 , revision);
+ "expecting 1, 2 or 3, got 0x%" PRIx8 , revision);
return;
}
@@ -2786,14 +2786,8 @@ static void method_test_LPI_return(
}
if (i == 0) {
- if (obj->Package.Elements[i].Integer.Value != 0) {
- fwts_failed(fw, LOG_LEVEL_HIGH,
- "Method_LPIBadRevision",
- "%s: Expected Revision to be 0, "
- "got 0x%4.4" PRIx64 ".", name,
- (uint64_t)obj->Package.Elements[i].Integer.Value);
+ if (fwts_method_test_revision(fw, name, obj->Package.Elements[i].Integer.Value, 0) != FWTS_OK)
failed = true;
- }
} else if (i == 2) {
if (obj->Package.Elements[i].Integer.Value != obj->Package.Count - 3) {
fwts_failed(fw, LOG_LEVEL_HIGH,
@@ -4500,12 +4494,8 @@ static void method_test_FPS_return(
return;
if (obj->Package.Elements[0].Type == ACPI_TYPE_INTEGER) {
- if (obj->Package.Elements[0].Integer.Value != 0) {
- fwts_failed(fw, LOG_LEVEL_MEDIUM,
- "Method_FPSBadRevision",
- "%s element 0 is not revision 0.", name);
+ if (fwts_method_test_revision(fw, name, obj->Package.Elements[0].Integer.Value, 0) != FWTS_OK)
failed = true;
- }
} else {
fwts_failed(fw, LOG_LEVEL_MEDIUM,
"Method_FPSBadReturnType",
@@ -4713,12 +4703,8 @@ static void method_test_ART_return(
return;
if (obj->Package.Elements[0].Type == ACPI_TYPE_INTEGER) {
- if (obj->Package.Elements[0].Integer.Value != 0) {
- fwts_failed(fw, LOG_LEVEL_MEDIUM,
- "Method_ARTBadRevision",
- "%s element 0 is not revision 0.", name);
+ if (fwts_method_test_revision(fw, name, obj->Package.Elements[0].Integer.Value, 0) != FWTS_OK)
failed = true;
- }
} else {
fwts_failed(fw, LOG_LEVEL_MEDIUM,
"Method_ARTBadReturnType",
--
2.25.1
More information about the fwts-devel
mailing list