diff options
| author | Ville Syrjälä <[email protected]> | 2019-09-25 17:14:40 +0300 |
|---|---|---|
| committer | Ville Syrjälä <[email protected]> | 2019-09-30 20:54:20 +0300 |
| commit | db0cc143b69e48e051610ae716d305270ea41ff6 (patch) | |
| tree | ee3e1c9b460cc3d0ff59acd7cf87147c7a3437d2 | |
| parent | 1ab2a99edb374732f429282e3e8f89df1b0ceed2 (diff) | |
drm/dp/mst: Reduce nested ifs
Replace the nested ifs with a single if and a logical AND.
Cc: Lyude Paul <[email protected]>
Signed-off-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Lucas De Marchi <[email protected]>
Reviewed-by: Lyude Paul <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/drm_dp_mst_topology.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index c8804ca6264c..dd06a50d4938 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -1123,11 +1123,11 @@ static void drm_dp_mst_put_payload_id(struct drm_dp_mst_topology_mgr *mgr, clear_bit(vcpi - 1, &mgr->vcpi_mask); for (i = 0; i < mgr->max_payloads; i++) { - if (mgr->proposed_vcpis[i]) - if (mgr->proposed_vcpis[i]->vcpi == vcpi) { - mgr->proposed_vcpis[i] = NULL; - clear_bit(i + 1, &mgr->payload_mask); - } + if (mgr->proposed_vcpis[i] && + mgr->proposed_vcpis[i]->vcpi == vcpi) { + mgr->proposed_vcpis[i] = NULL; + clear_bit(i + 1, &mgr->payload_mask); + } } mutex_unlock(&mgr->payload_lock); } |