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

[WHY]
mod_hdcp_execute_and_set returns (*status == MOD_HDCP_STATUS_SUCCESS).
When it return 0, it is guaranteed that status == MOD_HDCP_STATUS_SUCCESS
will be evaluated as false. Since now we are using goto out already, all 3
if (status == MOD_HDCP_STATUS_SUCCESS) clauses are guaranteed to enter.
Therefore we are removing the if statements due to redundancy.

Reviewed-by: Rodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Wenjing Liu <wenjing.liu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c
index d77836cef563571ad88b66cb10a90f4872515b3d..1e495e88448421f17f0d198ce732fa979ec237e2 100644 (file)
--- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c
+++ b/drivers/gpu/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;
 }