From 4d7c969dd8079c556f865ceef8057e5de89dc267 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Tue, 20 Jun 2023 03:12:51 +0800 Subject: [PATCH] util: Replace the usage of redundant u_align_u32 with align and remove u_align_u32 Signed-off-by: Yonggang Luo Reviewed-by: Jesse Natalie Part-of: --- src/util/u_vector.c | 2 +- src/util/u_vector.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/util/u_vector.c b/src/util/u_vector.c index 3c5593da77a..cd23b963e01 100644 --- a/src/util/u_vector.c +++ b/src/util/u_vector.c @@ -78,7 +78,7 @@ u_vector_add(struct u_vector *vector) * piece goes to the right locations. Thanks to the change in * size, it may or may not still wrap around. */ - split = u_align_u32(vector->tail, vector->size); + split = align(vector->tail, vector->size); assert(vector->tail <= split && split < vector->head); memcpy((char *)data + dst_tail, (char *)vector->data + src_tail, split - vector->tail); diff --git a/src/util/u_vector.h b/src/util/u_vector.h index 5a1a0893429..50e706e32fc 100644 --- a/src/util/u_vector.h +++ b/src/util/u_vector.h @@ -38,14 +38,6 @@ extern "C" { #endif -/* TODO - move to u_math.h - name it better etc */ -static inline uint32_t -u_align_u32(uint32_t v, uint32_t a) -{ - assert(a != 0 && a == (a & -((int32_t) a))); - return (v + a - 1) & ~(a - 1); -} - struct u_vector { uint32_t head; uint32_t tail;