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@engestrom.ch>

diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
index 6535fb0fa02cc9ea5a57d2cfcb5bf83df4256f7f..03035497cfc664477ac9e681cb52a30e82b96424 100644 (file)
--- 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 4e285c4639f449c2dde176f1fb183e538cc6fb88..0d84879273962d3aa32fdaa3881556a9d1830342 100644 (file)
--- 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 7282ca4b583b402808ec74f59e0ec4292deeb4bd..4ef7bc8ca1b06a4ab00f89b6423b63b37431c31d 100644 (file)
--- 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 6d69bc4c0b2091556f9680a120e31bda21ec5f37..d9309edf2797b70905ed749f9d9db6c587fa954e 100644 (file)
--- 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 c4a2ee6f13028d9c423d1d60358613abca72c74e..8776dde452175845be520272ccbe503f990f2f76 100644 (file)
--- 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 593be9c797b1da7c11f0976c80f8d2254b7b2b94..a31c3df0b705dc1ec6c765353d8d7a5c4597d62b 100644 (file)
--- 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 ada844b9eba5e4e43a3bb4974b18aa3864ff33fb..4074fb10b2209d425f7d180ca6a12e9eab339b24 100644 (file)
--- 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)))