dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Lyude Paul <lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Jerry Zuo <Jerry.Zuo-5C7GfCeVMHo@public.gmane.org>,
	Daniel Vetter <daniel-/w4YWyX8dFk@public.gmane.org>,
	David Airlie <airlied-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
	Harry Wentland <harry.wentland-5C7GfCeVMHo@public.gmane.org>,
	Juston Li <juston.li-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Subject: [PATCH v7 02/20] drm/dp_mst: Fix some formatting in drm_dp_payload_send_msg()
Date: Thu, 10 Jan 2019 19:53:25 -0500	[thread overview]
Message-ID: <20190111005343.17443-3-lyude@redhat.com> (raw)
In-Reply-To: <20190111005343.17443-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

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>
---
 drivers/gpu/drm/drm_dp_mst_topology.c | 14 ++++++++------
 1 file 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(
 	return NULL;
 }
 
-static struct drm_dp_mst_branch *drm_dp_get_mst_branch_device_by_guid(
-	struct drm_dp_mst_topology_mgr *mgr,
-	uint8_t *guid)
+static struct drm_dp_mst_branch *
+drm_dp_get_mst_branch_device_by_guid(struct drm_dp_mst_topology_mgr *mgr,
+				     uint8_t *guid)
 {
 	struct drm_dp_mst_branch *mstb;
 
@@ -1739,7 +1739,9 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr,
 	port_num = port->port_num;
 	mstb = drm_dp_get_validated_mstb_ref(mgr, port->parent);
 	if (!mstb) {
-		mstb = drm_dp_get_last_connected_port_and_mstb(mgr, port->parent, &port_num);
+		mstb = drm_dp_get_last_connected_port_and_mstb(mgr,
+							       port->parent,
+							       &port_num);
 
 		if (!mstb) {
 			drm_dp_put_port(port);
@@ -1765,9 +1767,9 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr,
 
 	ret = drm_dp_mst_wait_tx_reply(mstb, txmsg);
 	if (ret > 0) {
-		if (txmsg->reply.reply_type == 1) {
+		if (txmsg->reply.reply_type == 1)
 			ret = -EINVAL;
-		} else
+		else
 			ret = 0;
 	}
 	kfree(txmsg);
-- 
2.20.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  parent reply	other threads:[~2019-01-11  0:53 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-11  0:53 [PATCH v7 00/20] MST refcounting/atomic helpers cleanup Lyude Paul
2019-01-11  0:53 ` [PATCH v7 03/20] drm/dp_mst: Fix some formatting in drm_dp_mst_allocate_vcpi() Lyude Paul
2019-01-11  0:53 ` [PATCH v7 09/20] drm/dp_mst: Fix payload deallocation on hotplugs using malloc refs Lyude Paul
2019-01-11  0:53 ` [PATCH v7 12/20] drm/nouveau: Remove bogus cleanup in nv50_mstm_add_connector() Lyude Paul
     [not found] ` <20190111005343.17443-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2019-01-11  0:53   ` [PATCH v7 01/20] drm/dp_mst: Fix some formatting in drm_dp_add_port() Lyude Paul
2019-01-11  0:53   ` Lyude Paul [this message]
2019-01-11  0:53   ` [PATCH v7 04/20] drm/dp_mst: Fix some formatting in drm_dp_mst_deallocate_vcpi() Lyude Paul
2019-01-11  0:53   ` [PATCH v7 05/20] drm/dp_mst: Rename drm_dp_mst_get_validated_(port|mstb)_ref and friends Lyude Paul
2019-01-11  0:53   ` [PATCH v7 06/20] drm/dp_mst: Introduce new refcounting scheme for mstbs and ports Lyude Paul
2019-01-11  0:53   ` [PATCH v7 07/20] drm/dp_mst: Restart last_connected_port_and_mstb() if topology ref fails Lyude Paul
2019-01-11  0:53   ` [PATCH v7 08/20] drm/dp_mst: Stop releasing VCPI when removing ports from topology Lyude Paul
2019-01-11  0:53   ` [PATCH v7 10/20] drm/i915: Keep malloc references to MST ports Lyude Paul
2019-01-11  0:53   ` [PATCH v7 11/20] drm/amdgpu/display: Keep malloc ref to MST port Lyude Paul
2019-01-11  0:53   ` [PATCH v7 13/20] drm/nouveau: Remove unnecessary VCPI checks in nv50_msto_cleanup() Lyude Paul
2019-01-11  0:53   ` [PATCH v7 14/20] drm/nouveau: Keep malloc references to MST ports Lyude Paul
2019-01-11  0:53   ` [PATCH v7 15/20] drm/nouveau: Stop unsetting mstc->port, use malloc refs Lyude Paul
2019-01-11  0:53   ` [PATCH v7 16/20] drm/nouveau: Grab payload lock in nv50_msto_payload() Lyude Paul
2019-01-11  0:53   ` [PATCH v7 17/20] drm/dp_mst: Add some atomic state iterator macros Lyude Paul
2019-01-11  0:53   ` [PATCH v7 18/20] drm/dp_mst: Start tracking per-port VCPI allocations Lyude Paul
2019-01-11  0:53 ` [PATCH v7 19/20] drm/dp_mst: Check payload count in drm_dp_mst_atomic_check() Lyude Paul
2019-01-11  0:53 ` [PATCH v7 20/20] drm/nouveau: Use atomic VCPI helpers for MST Lyude Paul

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190111005343.17443-3-lyude@redhat.com \
    --to=lyude-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
    --cc=Jerry.Zuo-5C7GfCeVMHo@public.gmane.org \
    --cc=airlied-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=daniel-/w4YWyX8dFk@public.gmane.org \
    --cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=harry.wentland-5C7GfCeVMHo@public.gmane.org \
    --cc=intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=juston.li-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
    --cc=nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox