[PATCH i-g-t 4/4] tests/kms_content_protection: Make mst_cp_enable_with_retry() void

Suraj Kandpal suraj.kandpal at intel.com
Thu Sep 12 13:34:21 UTC 2024


Change the return type for test_mst_cp_enable_with_retry to void
since it really does not need to return anything back now that
the color change and enablement verification happen inside the
function itself.

Signed-off-by: Suraj Kandpal <suraj.kandpal at intel.com>
---
 tests/kms_content_protection.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index f17d9f2e8..59dca54df 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -662,7 +662,7 @@ static void test_cp_lic_on_mst(igt_output_t *mst_outputs[], int valid_outputs, i
 	}
 }
 
-static bool
+static void
 test_mst_cp_enable_with_retry(igt_output_t *hdcp_mst_output[], int valid_outputs,
 			      int retries, int content_type)
 {
@@ -704,8 +704,6 @@ test_mst_cp_enable_with_retry(igt_output_t *hdcp_mst_output[], int valid_outputs
 	} while (retries && !ret);
 
 	igt_assert_f(ret, "Content Protection not enabled on MST outputs\n");
-
-	return ret;
 }
 
 static void
@@ -764,7 +762,7 @@ test_content_protection_mst(int content_type)
 
 	igt_display_commit2(display, COMMIT_ATOMIC);
 
-	ret = test_mst_cp_enable_with_retry(hdcp_mst_output, valid_outputs, 2, content_type);
+	test_mst_cp_enable_with_retry(hdcp_mst_output, valid_outputs, 2, content_type);
 
 	if (data.cp_tests & CP_LIC)
 		test_cp_lic_on_mst(hdcp_mst_output, valid_outputs, 0);
-- 
2.43.2



More information about the igt-dev mailing list