The drm_atomic_state pointer passed to atomic_check is always valid, so
checking if it's NULL or not is pointless. Remove the check.

Suggested-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
Signed-off-by: Maxime Ripard <mrip...@kernel.org>
---
To: Russell King <li...@armlinux.org.uk>
---
 drivers/gpu/drm/armada/armada_plane.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/armada/armada_plane.c 
b/drivers/gpu/drm/armada/armada_plane.c
index 
cc47c032dbc151a463cbd0b0d048c74c2828f253..12a01a51d6fb7dc0e9264d4e4bf6dc4e1b472cb6
 100644
--- a/drivers/gpu/drm/armada/armada_plane.c
+++ b/drivers/gpu/drm/armada/armada_plane.c
@@ -92,16 +92,11 @@ int armada_drm_plane_atomic_check(struct drm_plane *plane,
        if (!new_plane_state->fb || WARN_ON(!new_plane_state->crtc)) {
                new_plane_state->visible = false;
                return 0;
        }
 
-       if (state)
-               crtc_state = drm_atomic_get_existing_crtc_state(state,
-                                                               crtc);
-       else
-               crtc_state = crtc->state;
-
+       crtc_state = drm_atomic_get_existing_crtc_state(state, crtc);
        ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state,
                                                  0,
                                                  INT_MAX, true, false);
        if (ret)
                return ret;

-- 
2.50.1

Reply via email to