alloc.h: remove rbrealloc() and rbrealloc_align()

These interfaces are no longer used anywhere, so they can be
safely removed.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

Author: kv2019i

posix/include/rtos/alloc.h

@@ -97,29 +97,6 @@ static inline void *rballoc(uint32_t flags, size_t bytes)
 	return rballoc_align(flags, bytes, PLATFORM_DCACHE_ALIGN);
 }
 
-/**
- * Changes size of the memory block allocated.
- * @param ptr Address of the block to resize.
- * @param flags Flags, see SOF_MEM_FLAG_...
- * @param bytes New size in bytes.
- * @param old_bytes Old size in bytes.
- * @param alignment Alignment in bytes.
- * @return Pointer to the resized memory of NULL if failed.
- */
-void *rbrealloc_align(void *ptr, uint32_t flags, size_t bytes,
-		      size_t old_bytes, uint32_t alignment);
-
-/**
- * Similar to rballoc_align(), returns resized buffer aligned to
- * PLATFORM_DCACHE_ALIGN.
- */
-static inline void *rbrealloc(void *ptr, uint32_t flags,
-			      size_t bytes, size_t old_bytes)
-{
-	return rbrealloc_align(ptr, flags, bytes, old_bytes,
-			       PLATFORM_DCACHE_ALIGN);
-}
-
 /**
  * Frees the memory block.
  * @param ptr Pointer to the memory block.

src/lib/alloc.c

@@ -38,18 +38,6 @@ void rfree(void *ptr)
 	free(ptr);
 }
 
-void *rbrealloc_align(void *ptr, uint32_t flags, size_t bytes,
-		      size_t old_bytes, uint32_t alignment)
-{
-	void *newptr = aligned_alloc(alignment, bytes);
-
-	if (!newptr)
-		return NULL;
-	memcpy(newptr, ptr, bytes > old_bytes ? old_bytes : bytes);
-	free(ptr);
-	return newptr;
-}
-
 /* TODO: all mm_pm_...() routines to be implemented for IMR storage */
 uint32_t mm_pm_context_size(void)
 {

src/platform/library/lib/alloc.c

@@ -42,12 +42,6 @@ void *rballoc_align(uint32_t flags, size_t bytes,
 	return malloc(bytes);
 }
 
-void *rbrealloc_align(void *ptr, uint32_t flags, size_t bytes,
-		      size_t old_bytes, uint32_t alignment)
-{
-	return realloc(ptr, bytes);
-}
-
 void *sof_heap_alloc(struct k_heap *heap, uint32_t flags, size_t bytes,
 		     size_t alignment)
 {

test/cmocka/src/common_mocks.c

@@ -59,16 +59,6 @@ void WEAK *rzalloc(uint32_t flags,
 	return calloc(bytes, 1);
 }
 
-void WEAK *rbrealloc_align(void *ptr, uint32_t flags,
-			   size_t bytes, size_t old_bytes, uint32_t alignment)
-{
-	(void)flags;
-	(void)old_bytes;
-	(void)alignment;
-
-	return realloc(ptr, bytes);
-}
-
 void WEAK *rmalloc_align(uint32_t flags, size_t bytes, uint32_t alignment)
 {
 	(void)flags;

zephyr/include/rtos/alloc.h

@@ -88,29 +88,6 @@ static inline void *rballoc(uint32_t flags, size_t bytes)
 	return rballoc_align(flags, bytes, PLATFORM_DCACHE_ALIGN);
 }
 
-/**
- * Changes size of the memory block allocated.
- * @param ptr Address of the block to resize.
- * @param flags Flags, see SOF_MEM_FLAG_...
- * @param bytes New size in bytes.
- * @param old_bytes Old size in bytes.
- * @param alignment Alignment in bytes.
- * @return Pointer to the resized memory of NULL if failed.
- */
-void *rbrealloc_align(void *ptr, uint32_t flags, size_t bytes,
-		      size_t old_bytes, uint32_t alignment);
-
-/**
- * Similar to rballoc_align(), returns resized buffer aligned to
- * PLATFORM_DCACHE_ALIGN.
- */
-static inline void *rbrealloc(void *ptr, uint32_t flags,
-			      size_t bytes, size_t old_bytes)
-{
-	return rbrealloc_align(ptr, flags, bytes, old_bytes,
-			       PLATFORM_DCACHE_ALIGN);
-}
-
 /**
  * Frees the memory block.
  * @param ptr Pointer to the memory block.

zephyr/lib/alloc.c

@@ -493,36 +493,6 @@ void *rmalloc(uint32_t flags, size_t bytes)
 }
 EXPORT_SYMBOL(rmalloc);
 
-void *rbrealloc_align(void *ptr, uint32_t flags, size_t bytes,
-		      size_t old_bytes, uint32_t alignment)
-{
-	void *new_ptr;
-
-	if (!ptr) {
-		return rballoc_align(flags, bytes, alignment);
-	}
-
-	/* Original version returns NULL without freeing this memory */
-	if (!bytes) {
-		/* TODO: Should we call rfree(ptr); */
-		tr_err(&zephyr_tr, "realloc failed for 0 bytes");
-		return NULL;
-	}
-
-	new_ptr = rballoc_align(flags, bytes, alignment);
-	if (!new_ptr)
-		return NULL;
-
-	if (!(flags & SOF_MEM_FLAG_NO_COPY))
-		memcpy_s(new_ptr, bytes, ptr, MIN(bytes, old_bytes));
-
-	rfree(ptr);
-
-	tr_info(&zephyr_tr, "rbealloc: new ptr %p", new_ptr);
-
-	return new_ptr;
-}
-
 /**
  * Similar to rmalloc(), guarantees that returned block is zeroed.
  */