[PATCH] lib: add PCIe ASPM configuration check in the batch test

[Keng-Yu Lin]

Signed-off-by: Keng-Yu Lin <kengyu at canonical.com>
---
 src/lib/src/fwts_aspm.c      |   14 +++++++++++++-
 src/lib/src/fwts_framework.c |    4 ----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/lib/src/fwts_aspm.c b/src/lib/src/fwts_aspm.c
index 3c3157a..8406f77 100644
--- a/src/lib/src/fwts_aspm.c
+++ b/src/lib/src/fwts_aspm.c
@@ -51,7 +51,7 @@ int fwts_facp_get_aspm_control(fwts_framework *fw, int *aspm)
 	return FWTS_OK;
 }
 
-int fwts_aspm_check_configuration(fwts_framework *fw)
+int aspm_check_configuration(fwts_framework *fw)
 {
 	int ret;
 	int aspm_facp;
@@ -66,3 +66,15 @@ int fwts_aspm_check_configuration(fwts_framework *fw)
 }
 
 
+static fwts_framework_minor_test aspm_tests[] = {
+	{ aspm_check_configuration, "PCIe ASPM configuration test." },
+	{ NULL, NULL }
+};
+
+static fwts_framework_ops aspm_ops = {
+	.description = "PCIe ASPM check.",
+	.minor_tests = aspm_tests
+};
+
+FWTS_REGISTER(aspm, &aspm_ops, FWTS_TEST_ANYTIME, FWTS_BATCH);
+
diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c
index 7064c44..9898537 100644
--- a/src/lib/src/fwts_framework.c
+++ b/src/lib/src/fwts_framework.c
@@ -76,7 +76,6 @@ static fwts_option fwts_framework_options[] = {
 	{ "json-data-path", 	"j:", 1, "Specify path to fwts json data files - default is /usr/share/fwts." },
 	{ "lp-tags-log", 	"",   0, "Output LaunchPad bug tags in results log." },
 	{ "disassemble-aml", 	"",   0, "Disassemble AML from DSDT and SSDT tables." },
-	{ "aspm", 		"",   0, "Test ASPM configuration." },
 	{ NULL, NULL, 0, NULL }
 };
 
@@ -968,9 +967,6 @@ int fwts_framework_options_handler(fwts_framework *fw, int argc, char * const ar
 		case 31: /* --disassemble-aml */
 			fwts_iasl_disassemble_all_to_file(fw);
 			return FWTS_COMPLETE;
-		case 32: /* --aspm */
-			fwts_aspm_check_configuration(fw);
-			return FWTS_COMPLETE;
 		}
 		break;
 	case 'a': /* --all */
-- 
1.7.5.4