From: Mario Limonciello Date: Fri, 28 Feb 2025 19:32:57 +0000 (-0600) Subject: drm/amd/display: Drop unnecessary ret variable for enable_assr() X-Git-Tag: v6.15-rc1~120^2~2^2~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=272385483e0b1cadfeae03548fb8798d178f13d9;p=thirdparty%2Flinux.git drm/amd/display: Drop unnecessary ret variable for enable_assr() [Why] enable_assr() has a res variable that only is changed in one block with no cleanup necessary. [How] Remove variable and return early from failure cases. Reviewed-by: Alex Hung Signed-off-by: Mario Limonciello Signed-off-by: Tom Chung Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c index 6f8f21e123c84..a3e93b2891f0f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c @@ -457,7 +457,6 @@ static bool enable_assr(void *handle, struct dc_link *link) struct mod_hdcp hdcp = hdcp_work->hdcp; struct psp_context *psp = hdcp.config.psp.handle; struct ta_dtm_shared_memory *dtm_cmd; - bool res = true; if (!psp->dtm_context.context.initialized) { DRM_INFO("Failed to enable ASSR, DTM TA is not initialized."); @@ -478,10 +477,10 @@ static bool enable_assr(void *handle, struct dc_link *link) if (dtm_cmd->dtm_status != TA_DTM_STATUS__SUCCESS) { DRM_INFO("Failed to enable ASSR"); - res = false; + return false; } - return res; + return true; } static void update_config(void *handle, struct cp_psp_stream_config *config)