[PATCH] kernel:version: change ACPI version to ACPICA version

Alex Hung alex.hung at canonical.com
Mon May 6 23:05:48 UTC 2019


The version read from /sys/module/acpi/parameters/acpica_version is not
ACPI version. The supported ACPI version is implemented in acpiinfo_test1.

This patch also fixes some incorrect indentation.

Signed-off-by: Alex Hung <alex.hung at canonical.com>
---
 src/kernel/version/version.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/kernel/version/version.c b/src/kernel/version/version.c
index 81d686d0..316711e5 100644
--- a/src/kernel/version/version.c
+++ b/src/kernel/version/version.c
@@ -26,7 +26,7 @@ static int version_test1(fwts_framework *fw)
 	fwts_release *release;
 
 	release = fwts_release_get();
-        if (release) {
+	if (release) {
 		bool not_ubuntu = strcmp(release->distributor, "Ubuntu");
 
 		fwts_release_free(release);
@@ -35,7 +35,7 @@ static int version_test1(fwts_framework *fw)
 			fwts_skipped(fw, "Information not available with this kernel.");
 			return FWTS_OK;
 		}
-        }
+	}
 
 	if ((str = fwts_get("/proc/version_signature")) == NULL)
 		fwts_skipped(fw,
@@ -56,7 +56,6 @@ static int version_test2(fwts_framework *fw)
 {
 	char *str;
 
-
 	if ((str = fwts_get("/proc/version")) == NULL)
 		fwts_log_info(fw, "Cannot get version info from /proc/version");
 	else {
@@ -90,7 +89,7 @@ static int version_test4(fwts_framework *fw)
 {
 	char *str;
 
-        if (((str = fwts_get("/sys/module/acpi/parameters/acpica_version")) == NULL) &&
+	if (((str = fwts_get("/sys/module/acpi/parameters/acpica_version")) == NULL) &&
 	    ((str = fwts_get("/proc/acpi/info")) == NULL))
 		fwts_log_info(fw,
 			"Cannot get ACPI version info from "
@@ -98,7 +97,7 @@ static int version_test4(fwts_framework *fw)
 			"or /proc/acpi/info, system does not have ACPI.");
 	else {
 		fwts_chop_newline(str);
-		fwts_log_info(fw, "ACPI Version: %s", str);
+		fwts_log_info(fw, "ACPICA Version: %s", str);
 		free(str);
 	}
 	fwts_infoonly(fw);
-- 
2.17.1




More information about the fwts-devel mailing list