aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_dp_mst_topology.c
diff options
context:
space:
mode:
authorLyude Paul <lyude@redhat.com>2019-01-10 19:53:25 -0500
committerLyude Paul <lyude@redhat.com>2019-01-10 20:12:17 -0500
commitde6d68182f22c67f2f013eadf7b043557fc411ec (patch)
tree4ec514591945d485ed38422a9f355059e8dda4f4 /drivers/gpu/drm/drm_dp_mst_topology.c
parent3d76df632d7f4ebc72338f56efb26d032ef74fb6 (diff)
drm/dp_mst: Fix some formatting in drm_dp_payload_send_msg()
Split some stuff across multiple lines, remove some unnecessary braces Signed-off-by: Lyude Paul <lyude@redhat.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Daniel Vetter <daniel@ffwll.ch> Cc: David Airlie <airlied@redhat.com> Cc: Jerry Zuo <Jerry.Zuo@amd.com> Cc: Juston Li <juston.li@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190111005343.17443-3-lyude@redhat.com
Diffstat (limited to 'drivers/gpu/drm/drm_dp_mst_topology.c')
-rw-r--r--drivers/gpu/drm/drm_dp_mst_topology.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index c93bff5527fd..fc93a71c42b0 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -1331,9 +1331,9 @@ static struct drm_dp_mst_branch *get_mst_branch_device_by_guid_helper(
1331 return NULL; 1331 return NULL;
1332} 1332}
1333 1333
1334static struct drm_dp_mst_branch *drm_dp_get_mst_branch_device_by_guid( 1334static struct drm_dp_mst_branch *
1335 struct drm_dp_mst_topology_mgr *mgr, 1335drm_dp_get_mst_branch_device_by_guid(struct drm_dp_mst_topology_mgr *mgr,
1336 uint8_t *guid) 1336 uint8_t *guid)
1337{ 1337{
1338 struct drm_dp_mst_branch *mstb; 1338 struct drm_dp_mst_branch *mstb;
1339 1339
@@ -1739,7 +1739,9 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr,
1739 port_num = port->port_num; 1739 port_num = port->port_num;
1740 mstb = drm_dp_get_validated_mstb_ref(mgr, port->parent); 1740 mstb = drm_dp_get_validated_mstb_ref(mgr, port->parent);
1741 if (!mstb) { 1741 if (!mstb) {
1742 mstb = drm_dp_get_last_connected_port_and_mstb(mgr, port->parent, &port_num); 1742 mstb = drm_dp_get_last_connected_port_and_mstb(mgr,
1743 port->parent,
1744 &port_num);
1743 1745
1744 if (!mstb) { 1746 if (!mstb) {
1745 drm_dp_put_port(port); 1747 drm_dp_put_port(port);
@@ -1765,9 +1767,9 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr,
1765 1767
1766 ret = drm_dp_mst_wait_tx_reply(mstb, txmsg); 1768 ret = drm_dp_mst_wait_tx_reply(mstb, txmsg);
1767 if (ret > 0) { 1769 if (ret > 0) {
1768 if (txmsg->reply.reply_type == 1) { 1770 if (txmsg->reply.reply_type == 1)
1769 ret = -EINVAL; 1771 ret = -EINVAL;
1770 } else 1772 else
1771 ret = 0; 1773 ret = 0;
1772 } 1774 }
1773 kfree(txmsg); 1775 kfree(txmsg);