Mesa (master): util: remove LIST_DELINIT macro

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c976b427c4e376d93396325a4c1ca47349f618e8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c976b427c4e376d93396325a4c1ca47349f618e8

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Mon Oct 28 10:08:00 2019 +1100

util: remove LIST_DELINIT macro

Just use the inlined function directly. The macro was replaced with
the function in ebe304fa540f.

Reviewed-by: Eric Engestrom <eric at engestrom.ch>

---

 src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c | 6 +++---
 src/gallium/auxiliary/util/u_dirty_surfaces.h     | 2 +-
 src/gallium/drivers/r600/r600_query.c             | 2 +-
 src/gallium/drivers/r600/r600_state_common.c      | 2 +-
 src/gallium/drivers/radeonsi/si_query.c           | 2 +-
 src/gallium/winsys/svga/drm/vmw_fence.c           | 6 +++---
 src/util/list.h                                   | 1 -
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
index 6535fb0fa02..03035497cfc 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
@@ -214,7 +214,7 @@ pb_slab_buffer_destroy(struct pb_buffer *_buf)
    /* If the slab becomes totally empty, free it */
    if (slab->numFree == slab->numBuffers) {
       list = &slab->head;
-      LIST_DELINIT(list);
+      list_delinit(list);
       pb_reference(&slab->bo, NULL);
       FREE(slab->buffers);
       FREE(slab);
@@ -412,10 +412,10 @@ pb_slab_manager_create_buffer(struct pb_manager *_mgr,
    
    /* If totally full remove from the partial slab list */
    if (--slab->numFree == 0)
-      LIST_DELINIT(list);
+      list_delinit(list);
 
    list = slab->freeBuffers.next;
-   LIST_DELINIT(list);
+   list_delinit(list);
 
    mtx_unlock(&mgr->mutex);
    buf = LIST_ENTRY(struct pb_slab_buffer, list, head);
diff --git a/src/gallium/auxiliary/util/u_dirty_surfaces.h b/src/gallium/auxiliary/util/u_dirty_surfaces.h
index 4e285c4639f..0d848792739 100644
--- a/src/gallium/auxiliary/util/u_dirty_surfaces.h
+++ b/src/gallium/auxiliary/util/u_dirty_surfaces.h
@@ -113,7 +113,7 @@ static inline void
 util_dirty_surface_set_clean(struct util_dirty_surfaces *dss, struct util_dirty_surface *ds)
 {
    if(!LIST_IS_EMPTY(&ds->dirty_list))
-      LIST_DELINIT(&ds->dirty_list);
+      list_delinit(&ds->dirty_list);
 }
 
 #endif
diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c
index 7282ca4b583..4ef7bc8ca1b 100644
--- a/src/gallium/drivers/r600/r600_query.c
+++ b/src/gallium/drivers/r600/r600_query.c
@@ -1070,7 +1070,7 @@ bool r600_query_hw_end(struct r600_common_context *rctx,
 	r600_query_hw_emit_stop(rctx, query);
 
 	if (!(query->flags & R600_QUERY_HW_FLAG_NO_START))
-		LIST_DELINIT(&query->list);
+		list_delinit(&query->list);
 
 	if (!query->buffer.buf)
 		return false;
diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index 6d69bc4c0b2..d9309edf279 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -419,7 +419,7 @@ static void r600_sampler_view_destroy(struct pipe_context *ctx,
 
 	if (view->tex_resource->gpu_address &&
 	    view->tex_resource->b.b.target == PIPE_BUFFER)
-		LIST_DELINIT(&view->list);
+		list_delinit(&view->list);
 
 	pipe_resource_reference(&state->texture, NULL);
 	FREE(view);
diff --git a/src/gallium/drivers/radeonsi/si_query.c b/src/gallium/drivers/radeonsi/si_query.c
index c4a2ee6f130..8776dde4521 100644
--- a/src/gallium/drivers/radeonsi/si_query.c
+++ b/src/gallium/drivers/radeonsi/si_query.c
@@ -1171,7 +1171,7 @@ bool si_query_hw_end(struct si_context *sctx,
 	si_query_hw_emit_stop(sctx, query);
 
 	if (!(query->flags & SI_QUERY_HW_FLAG_NO_START)) {
-		LIST_DELINIT(&query->b.active_list);
+		list_delinit(&query->b.active_list);
 		sctx->num_cs_dw_queries_suspend -= query->b.num_cs_dw_suspend;
 	}
 
diff --git a/src/gallium/winsys/svga/drm/vmw_fence.c b/src/gallium/winsys/svga/drm/vmw_fence.c
index 593be9c797b..a31c3df0b70 100644
--- a/src/gallium/winsys/svga/drm/vmw_fence.c
+++ b/src/gallium/winsys/svga/drm/vmw_fence.c
@@ -107,7 +107,7 @@ vmw_fences_release(struct vmw_fence_ops *ops)
 
    mtx_lock(&ops->mutex);
    LIST_FOR_EACH_ENTRY_SAFE(fence, n, &ops->not_signaled, ops_list)
-      LIST_DELINIT(&fence->ops_list);
+      list_delinit(&fence->ops_list);
    mtx_unlock(&ops->mutex);
 }
 
@@ -150,7 +150,7 @@ vmw_fences_signal(struct pb_fence_ops *fence_ops,
          break;
 
       p_atomic_set(&fence->signalled, 1);
-      LIST_DELINIT(&fence->ops_list);
+      list_delinit(&fence->ops_list);
    }
    ops->last_signaled = signaled;
    ops->last_emitted = emitted;
@@ -264,7 +264,7 @@ vmw_fence_reference(struct vmw_winsys_screen *vws,
             vmw_ioctl_fence_unref(vws, vfence->handle);
 
             mtx_lock(&ops->mutex);
-            LIST_DELINIT(&vfence->ops_list);
+            list_delinit(&vfence->ops_list);
             mtx_unlock(&ops->mutex);
          }
 
diff --git a/src/util/list.h b/src/util/list.h
index ada844b9eba..4074fb10b22 100644
--- a/src/util/list.h
+++ b/src/util/list.h
@@ -159,7 +159,6 @@ static inline void list_validate(const struct list_head *list)
 }
 
 #define LIST_DEL(__item) list_del(__item)
-#define LIST_DELINIT(__item) list_delinit(__item)
 
 #define LIST_ENTRY(__type, __item, __field)   \
     ((__type *)(((char *)(__item)) - offsetof(__type, __field)))