drm/atomic: Remove unneeded null check for private objects

It can be seen in drm_atomic_get_private_obj_state() that
ptr will never be NULL, so skip the check for that case.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170927083532.5756-1-maarten.lankhorst@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 366c56fe5f58409b5269875c1e9cf09d451c9c55..6c9c4a8e09af7393ae9efad9f1c50b4f1dbee4ba 100644 (file)
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -182,9 +182,6 @@ void drm_atomic_state_default_clear(struct drm_atomic_state *state)
        for (i = 0; i < state->num_private_objs; i++) {
                struct drm_private_obj *obj = state->private_objs[i].ptr;
 
-               if (!obj)
-                       continue;
-
                obj->funcs->atomic_destroy_state(obj,
                                                 state->private_objs[i].state);
                state->private_objs[i].ptr = NULL;

diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index 5834580d75bca03689ff327fcbcdf611fce839c3..6fae95f28e10cb0f3d8cc129572834e75a635441 100644 (file)
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -768,8 +768,7 @@ void drm_state_dump(struct drm_device *dev, struct drm_printer *p);
                     ((obj) = (__state)->private_objs[__i].ptr, \
                      (old_obj_state) = (__state)->private_objs[__i].old_state, \
                      (new_obj_state) = (__state)->private_objs[__i].new_state, 1); \
-            (__i)++) \
-               for_each_if (obj)
+            (__i)++)
 
 /**
  * for_each_old_private_obj_in_state - iterate over all private objects in an atomic update
@@ -787,8 +786,7 @@ void drm_state_dump(struct drm_device *dev, struct drm_printer *p);
             (__i) < (__state)->num_private_objs && \
                     ((obj) = (__state)->private_objs[__i].ptr, \
                      (old_obj_state) = (__state)->private_objs[__i].old_state, 1); \
-            (__i)++) \
-               for_each_if (obj)
+            (__i)++)
 
 /**
  * for_each_new_private_obj_in_state - iterate over all private objects in an atomic update
@@ -806,8 +804,7 @@ void drm_state_dump(struct drm_device *dev, struct drm_printer *p);
             (__i) < (__state)->num_private_objs && \
                     ((obj) = (__state)->private_objs[__i].ptr, \
                      (new_obj_state) = (__state)->private_objs[__i].new_state, 1); \
-            (__i)++) \
-               for_each_if (obj)
+            (__i)++)
 
 /**
  * drm_atomic_crtc_needs_modeset - compute combined modeset need