drm/dp_mst: Simplify error path in drm_dp_mst_handle_down_rep()

Simplify the error return path in drm_dp_mst_handle_down_rep(),
preparing for the next patch.

While at it use reset_msg_rx_state() instead of open-coding it.

Cc: Lyude Paul <lyude@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241203160223.2926014-4-imre.deak@intel.com

diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
index bcf3a33123be1c7a4859baa4150924160b98b1be..6ec8680998d5aa738496e4ca37774573752befb0 100644 (file)
--- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
@@ -4013,9 +4013,6 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr)
                            txmsg->reply.u.nak.nak_data);
        }
 
-       memset(msg, 0, sizeof(struct drm_dp_sideband_msg_rx));
-       drm_dp_mst_topology_put_mstb(mstb);
-
        mutex_lock(&mgr->qlock);
        txmsg->state = DRM_DP_SIDEBAND_TX_RX;
        list_del(&txmsg->next);
@@ -4023,10 +4020,8 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr)
 
        wake_up_all(&mgr->tx_waitq);
 
-       return 0;
-
 out_clear_reply:
-       memset(msg, 0, sizeof(struct drm_dp_sideband_msg_rx));
+       reset_msg_rx_state(msg);
 out:
        if (mstb)
                drm_dp_mst_topology_put_mstb(mstb);