From 745bae40adfdc6c6107cd104dcdc5195e95b0230 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sat, 22 Jun 2019 18:08:08 +0100 Subject: [PATCH] gallium/aux: replace MAYBE_UNUSED with UNUSED MAYBE_UNUSED is going away, so let's replace legitimate uses of it with UNUSED, which the former aliased to so far anyway. Signed-off-by: Eric Engestrom Reviewed-by: Matt Turner --- src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 2 +- src/gallium/auxiliary/util/u_threaded_context.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c index f2541e8691d..c2a3896b8f7 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c @@ -277,7 +277,7 @@ fail: static void pipe_loader_sw_release(struct pipe_loader_device **dev) { - MAYBE_UNUSED struct pipe_loader_sw_device *sdev = + UNUSED struct pipe_loader_sw_device *sdev = pipe_loader_sw_device(*dev); #ifndef GALLIUM_STATIC_TARGETS diff --git a/src/gallium/auxiliary/util/u_threaded_context.c b/src/gallium/auxiliary/util/u_threaded_context.c index 820a8fe4443..3eaab0b7bef 100644 --- a/src/gallium/auxiliary/util/u_threaded_context.c +++ b/src/gallium/auxiliary/util/u_threaded_context.c @@ -64,7 +64,7 @@ typedef void (*tc_execute)(struct pipe_context *pipe, union tc_payload *payload) static const tc_execute execute_func[TC_NUM_CALLS]; static void -tc_batch_check(MAYBE_UNUSED struct tc_batch *batch) +tc_batch_check(UNUSED struct tc_batch *batch) { tc_assert(batch->sentinel == TC_SENTINEL); tc_assert(batch->num_total_call_slots <= TC_CALLS_PER_BATCH); @@ -180,7 +180,7 @@ tc_is_sync(struct threaded_context *tc) } static void -_tc_sync(struct threaded_context *tc, MAYBE_UNUSED const char *info, MAYBE_UNUSED const char *func) +_tc_sync(struct threaded_context *tc, UNUSED const char *info, UNUSED const char *func) { struct tc_batch *last = &tc->batch_slots[tc->last]; struct tc_batch *next = &tc->batch_slots[tc->next]; -- 2.30.2