From: Lucas Stach Date: Fri, 7 Feb 2025 18:22:46 +0000 (+0100) Subject: drm/rockchip: vop: remove redundant condition check X-Git-Tag: v6.16-rc1~144^2~16^2~150 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcdc354a0a545e0e78c6f068e5a11c0285e06eeb;p=thirdparty%2Fkernel%2Fstable.git drm/rockchip: vop: remove redundant condition check Instead of checking the same thing twice in a row, fold the second condition into the first clause. Signed-off-by: Lucas Stach Reviewed-by: Andy Yan Signed-off-by: Heiko Stuebner Link: https://lore.kernel.org/r/20250207182247.215537-1-l.stach@pengutronix.de --- diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index e3596e2b557d0..ba6b0528d1e5a 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -733,11 +733,10 @@ static void vop_crtc_atomic_disable(struct drm_crtc *crtc, WARN_ON(vop->event); - if (crtc->state->self_refresh_active) + if (crtc->state->self_refresh_active) { rockchip_drm_set_win_enabled(crtc, false); - - if (crtc->state->self_refresh_active) goto out; + } mutex_lock(&vop->vop_lock);