Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Bernard Zhao <bernard@vivo.com>
To:     Harry Wentland <harry.wentland@amd.com>,
        Leo Li <sunpeng.li@amd.com>,
        Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
        Alex Deucher <alexander.deucher@amd.com>,
        =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>,
        Jun Lei <Jun.Lei@amd.com>,
        Meenakshikumar Somasundaram <meenakshikumar.somasundaram@amd.com>,
        Martin Leung <martin.leung@amd.com>,
        Alvin Lee <alvin.lee2@amd.com>,
        Samson Tam <Samson.Tam@amd.com>, Alex Hung <alex.hung@amd.com>,
        Joshua Aberback <joshua.aberback@amd.com>,
        Wenjing Liu <wenjing.liu@amd.com>,
        amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
Cc:     zhaojunkui2008@126.com, Bernard Zhao <bernard@vivo.com>
Subject: [PATCH] drm/amd: remove possible condition with no effect (if == else)
Date:   Tue, 23 Aug 2022 00:00:44 -0700
Message-Id: <20220823070047.20930-1-bernard@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RN2HJiwzk7GRB8m2HN0MlE24/4suq5CMobG8tVepP8DcWW7nJuyZli1rWIYE?=
 =?us-ascii?Q?4/fYSNo5GFxmogGLYx2I94KEZT8nIUquOlehaQyfW4N7zRr/nkr9UtdMyGGE?=
 =?us-ascii?Q?AvU34v7cdLMtAWbufZU9fwOvcxnM9AMU6inSA8Ky1m607/9jawT/s4GKozk0?=
 =?us-ascii?Q?ez0hDoQg1cD6E9FKKN9nExKtoBKqMpae/cxD4B1HMFd1wWbtYcpm2RKACIHB?=
 =?us-ascii?Q?TDw1/i4jm4dCJIhnOp7M5aEuo6ZIwY7lIVsivX6JFH9reDNOFbcY//i5N1LZ?=
 =?us-ascii?Q?QQuVVGpr65A2KvKwjMcH9ys2An1q5NH6c0rVyobSq77ChB79uA+Bzq9rMS5F?=
 =?us-ascii?Q?5ycrgNo8V+BF3ZX/WjeHnJSjhIX6ZFDyEDz8w4I5obrGy6fNySO35pNKuDze?=
 =?us-ascii?Q?MK6ROIrR4ucn3NaTu+MAfZVABaTPsC8Z2bF4UUA6oNymkQLABmnaxDI1BV9P?=
 =?us-ascii?Q?DxkIFKAN/nRY3J4AfIxpI4XU8pOXYJqXzZbd6fqWbtpYFUqgILfb7HkDuX2q?=
 =?us-ascii?Q?faTCrk+xsCw/jl/n8Wc3XLvQK0YRs4yQ/e4696226zM0QYgZFdlBrf4X76w+?=
 =?us-ascii?Q?CDxxV+0w+xO1JLL9Url5PBUQVc7j3YKVcHPYN51rcQPfBhm85fHWXFI4KeC9?=
 =?us-ascii?Q?fLMxufTLvhHAK8hv+Xz2JerZj/sDGz2vxafD/Zx9uaRu9BcWR28Ol2bYkQT1?=
 =?us-ascii?Q?dQS+lYxPwx/NvJ+b0J8XuoarLfeTq6AdWLOtxBKL/gHOouB/W3mNUWUaqyqA?=
 =?us-ascii?Q?M4RmKroXiK5EtxRfavi/0GLngh3BkzsGSIw3Tb2aE+yhEBhE+oWD1yVfITZy?=
 =?us-ascii?Q?jjfhzw0vSU+sHTwKqiq2ZzUrr8F/UZ/KuW4Yd1D1VGL5MBg+pUuv2y1iJEqK?=
 =?us-ascii?Q?NMN0Z+e2h+IGyJ15CZDPlTpwctpFPT05F83f2yrrTfcVm8SG77o3yKVYg9jl?=
 =?us-ascii?Q?9I2BVZCEgoimAnw2Un1fDxwVsNhIDtIeEDHAFQmzNurgsSZ0HsFs+ymwTjfE?=
 =?us-ascii?Q?f8UUo+iRRHVL9kbzoTDvQTtzMQonpS4KPzk9aJnyD4R/Ipz7GRzQJJ0N7gGQ?=
 =?us-ascii?Q?GSP/BKDQyLZU9x6JsD5k58Yo9VF/2rk2pm8fEb2z42LYK2kC1uzk7CbI3unb?=
 =?us-ascii?Q?KFkSpQ+LUNhANtI4Q8/yIvfJeZtolXCsHRt92VIwBgv67vwigasCJ3+wABVm?=
 =?us-ascii?Q?l/JJ0RGwjMHcgxlBuVWfcMFQyd0fFEQP2l6vBStelF94eZtmAW7i7M4SdeyO?=
 =?us-ascii?Q?6+VeiYNMD+ndHKPvSX/4zKB5djZotP8AERKZqA8Jt5fom9xWyFOCRjC3Cdlt?=
 =?us-ascii?Q?HmTpV6CP/fcozQbYcZvwDDMwbJs1ERFbh/f9MKHCe264g2LPg8/M1D6igF1M?=
 =?us-ascii?Q?kfJiQaTIWA74HcclU+7VQsfdWKYrJK5IzirdacLtZCHmeIYJb8L1LWScJXQ8?=
 =?us-ascii?Q?WUVpxwsjDojrmRapWUM4gGIIv/cSS7RN6F3YmDb9+pGVLgKcqtp+vxWt318O?=
 =?us-ascii?Q?6sjt6FkZIFXqWJewFCHmUTHW2yWQSkFWFpDqxkQPZvDoxm1jhRiM/hCO7BHW?=
 =?us-ascii?Q?N/o8cAlPzf0K9u4J/vsFinVHT2bsn1vQYALTY3DD?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 93fe2b21-6584-4a59-3ee4-08da84d53cfc
X-MS-Exchange-CrossTenant-AuthSource: PSAPR06MB4021.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2022 07:01:01.5680
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: mDu+6c42WbTMI4euaNkUxX3idGFPgPfhklr885o4tIfIEJ5ywyknRnv/zA7kFruaD7At1xTxonMw8SRZ3qf3rQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB4900
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This patch fix cocci warning:
drivers/gpu/drm/amd/display/dc/core/dc.c:3335:2-4: WARNING:
possible condition with no effect (if == else).

Signed-off-by: Bernard Zhao <bernard@vivo.com>
---
 drivers/gpu/drm/amd/display/dc/core/dc.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index aeecca68dea7..2d4c44083d79 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -3332,13 +3332,8 @@ static void commit_planes_for_stream(struct dc *dc,
 		/* Since phantom pipe programming is moved to post_unlock_program_front_end,
 		 * move the SubVP lock to after the phantom pipes have been setup
 		 */
-		if (should_lock_all_pipes && dc->hwss.interdependent_update_lock) {
-			if (dc->hwss.subvp_pipe_control_lock)
-				dc->hwss.subvp_pipe_control_lock(dc, context, false, should_lock_all_pipes, NULL, subvp_prev_use);
-		} else {
-			if (dc->hwss.subvp_pipe_control_lock)
-				dc->hwss.subvp_pipe_control_lock(dc, context, false, should_lock_all_pipes, NULL, subvp_prev_use);
-		}
+		if (dc->hwss.subvp_pipe_control_lock)
+			dc->hwss.subvp_pipe_control_lock(dc, context, false, should_lock_all_pipes, NULL, subvp_prev_use);
 		return;
 	}
 
-- 
2.33.1