]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/mst: Some style improvements in drm_dp_mst_topology_mgr_set_mst()
authorJosé Roberto de Souza <jose.souza@intel.com>
Fri, 17 Jan 2020 01:58:35 +0000 (17:58 -0800)
committerLyude Paul <lyude@redhat.com>
Fri, 17 Jan 2020 21:19:03 +0000 (16:19 -0500)
Removing this lose code block and removing unnecessary bracket.

Cc: Lyude Paul <lyude@redhat.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200117015837.402239-2-jose.souza@intel.com
drivers/gpu/drm/drm_dp_mst_topology.c

index f17e68d85afa5c3470a2582b2de00fd2e5dce953..f45e36f04ca97674868634b9c346623e51e28208 100644 (file)
@@ -3454,6 +3454,8 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
        mgr->mst_state = mst_state;
        /* set the device into MST mode */
        if (mst_state) {
+               struct drm_dp_payload reset_pay;
+
                WARN_ON(mgr->mst_primary);
 
                /* get dpcd info */
@@ -3484,16 +3486,12 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
 
                ret = drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL,
                                                         DP_MST_EN | DP_UP_REQ_EN | DP_UPSTREAM_IS_SRC);
-               if (ret < 0) {
+               if (ret < 0)
                        goto out_unlock;
-               }
 
-               {
-                       struct drm_dp_payload reset_pay;
-                       reset_pay.start_slot = 0;
-                       reset_pay.num_slots = 0x3f;
-                       drm_dp_dpcd_write_payload(mgr, 0, &reset_pay);
-               }
+               reset_pay.start_slot = 0;
+               reset_pay.num_slots = 0x3f;
+               drm_dp_dpcd_write_payload(mgr, 0, &reset_pay);
 
                queue_work(system_long_wq, &mgr->work);