[PATCH 24/27] drm/amd/display: Use _free() macro for amdgpu_dm_update_connector_after_detect()

[Wayne Lin]

From: Mario Limonciello <mario.limoncie...@amd.com>

By using a _free() macro multiple duplicated snippets of code to free
the sink can be dropped. The sink will be released when leaving scope.

Reviewed-by: Alex Hung <alex.h...@amd.com>
Signed-off-by: Mario Limonciello <mario.limoncie...@amd.com>
Signed-off-by: Wayne Lin <wayne....@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index e0cce4883148..b6fae48a9599 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3646,12 +3646,14 @@ static void update_connector_ext_caps(struct 
amdgpu_dm_connector *aconnector)
        }
 }
 
+DEFINE_FREE(sink_release, struct dc_sink *, if (_T) dc_sink_release(_T))
+
 void amdgpu_dm_update_connector_after_detect(
                struct amdgpu_dm_connector *aconnector)
 {
        struct drm_connector *connector = &aconnector->base;
+       struct dc_sink *sink __free(sink_release) = NULL;
        struct drm_device *dev = connector->dev;
-       struct dc_sink *sink;
 
        /* MST handled by drm_mst framework */
        if (aconnector->mst_mgr.mst_state == true)
@@ -3698,8 +3700,6 @@ void amdgpu_dm_update_connector_after_detect(
                        }
                }
 
-               if (sink)
-                       dc_sink_release(sink);
                return;
        }
 
@@ -3707,10 +3707,8 @@ void amdgpu_dm_update_connector_after_detect(
         * TODO: temporary guard to look for proper fix
         * if this sink is MST sink, we should not do anything
         */
-       if (sink && sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT_MST) {
-               dc_sink_release(sink);
+       if (sink && sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT_MST)
                return;
-       }
 
        if (aconnector->dc_sink == sink) {
                /*
@@ -3719,8 +3717,6 @@ void amdgpu_dm_update_connector_after_detect(
                 */
                drm_dbg_kms(dev, "DCHPD: connector_id=%d: dc_sink didn't 
change.\n",
                                 aconnector->connector_id);
-               if (sink)
-                       dc_sink_release(sink);
                return;
        }
 
@@ -3790,9 +3786,6 @@ void amdgpu_dm_update_connector_after_detect(
        }
 
        update_subconnector_property(aconnector);
-
-       if (sink)
-               dc_sink_release(sink);
 }
 
 static void handle_hpd_irq_helper(struct amdgpu_dm_connector *aconnector)
-- 
2.37.3