From: jsg <jsg@openbsd.org>
Date: Fri, 18 Oct 2024 00:00:40 +0000 (+0000)
Subject: drm/amd/display: Remove a redundant check in authenticated_dp
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ecdc81419ceda7eb6f0c86f721cba4d4e1a38177;p=openbsd

drm/amd/display: Remove a redundant check in authenticated_dp

From Wenjing Liu
b505e4fc411c1015ff5114b0cca8c9b20ae2f679 in linux-6.6.y/6.6.57
4b22869f76563ce1e10858d2ae3305affa8d4a6a in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/display/modules/hdcp/hdcp1_execution.c b/sys/dev/pci/drm/amd/display/modules/hdcp/hdcp1_execution.c
index 93c0455766d..b7da7037fe0 100644
--- a/sys/dev/pci/drm/amd/display/modules/hdcp/hdcp1_execution.c
+++ b/sys/dev/pci/drm/amd/display/modules/hdcp/hdcp1_execution.c
@@ -432,21 +432,18 @@ static enum mod_hdcp_status authenticated_dp(struct mod_hdcp *hdcp,
 		goto out;
 	}
 
-	if (status == MOD_HDCP_STATUS_SUCCESS)
-		if (!mod_hdcp_execute_and_set(mod_hdcp_read_bstatus,
-				&input->bstatus_read, &status,
-				hdcp, "bstatus_read"))
-			goto out;
-	if (status == MOD_HDCP_STATUS_SUCCESS)
-		if (!mod_hdcp_execute_and_set(check_link_integrity_dp,
-				&input->link_integrity_check, &status,
-				hdcp, "link_integrity_check"))
-			goto out;
-	if (status == MOD_HDCP_STATUS_SUCCESS)
-		if (!mod_hdcp_execute_and_set(check_no_reauthentication_request_dp,
-				&input->reauth_request_check, &status,
-				hdcp, "reauth_request_check"))
-			goto out;
+	if (!mod_hdcp_execute_and_set(mod_hdcp_read_bstatus,
+			&input->bstatus_read, &status,
+			hdcp, "bstatus_read"))
+		goto out;
+	if (!mod_hdcp_execute_and_set(check_link_integrity_dp,
+			&input->link_integrity_check, &status,
+			hdcp, "link_integrity_check"))
+		goto out;
+	if (!mod_hdcp_execute_and_set(check_no_reauthentication_request_dp,
+			&input->reauth_request_check, &status,
+			hdcp, "reauth_request_check"))
+		goto out;
 out:
 	return status;
 }