Message ID | 20250207182247.215537-1-l.stach@pengutronix.de (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | [1/2] drm/rockchip: vop: remove redundant condition check | expand |
Hi Lucas, At 2025-02-08 02:22:46, "Lucas Stach" <l.stach@pengutronix.de> wrote: >Instead of checking the same thing twice in a row, fold the second >condition into the first clause. > >Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Reviewed-by: Andy Yan <andyshrk@163.com> Thanks >--- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > >diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c >index 57747f1cff26..7f5fbea34951 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); > > >base-commit: 2014c95afecee3e76ca4a56956a936e23283f05b >-- >2.48.1 >
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 57747f1cff26..7f5fbea34951 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);
Instead of checking the same thing twice in a row, fold the second condition into the first clause. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) base-commit: 2014c95afecee3e76ca4a56956a936e23283f05b