vregion: make two functions inline

Make vregion_alloc() and vregion_alloc_coherent() static inlines,
calling their respective aligned versions with zero alignment.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

src/include/sof/lib/vregion.h

@@ -83,36 +83,42 @@ __syscall struct vregion *vregion_get(struct vregion *vr);
 __syscall struct vregion *vregion_put(struct vregion *vr);
 
 /**
- * @brief Allocate memory from the specified virtual region.
+ * @brief Allocate aligned memory from the specified virtual region.
+ *
+ * Allocate aligned memory from the specified virtual region using the
+ * current allocation mode (lifetime or interim).
  *
  * @param[in] vr Pointer to the virtual region instance.
  * @param[in] size Size of memory to allocate in bytes.
+ * @param[in] alignment Alignment of memory to allocate in bytes.
  * @return void* Pointer to the allocated memory, or NULL on failure.
  */
-__syscall void *vregion_alloc(struct vregion *vr, size_t size);
+__syscall void *vregion_alloc_align(struct vregion *vr, size_t size, size_t alignment);
 
 /**
- * @brief like vregion_alloc() but allocates coherent memory
+ * @brief like vregion_alloc_align() but allocates coherent memory
  */
-__syscall void *vregion_alloc_coherent(struct vregion *vr, size_t size);
+__syscall void *vregion_alloc_coherent_align(struct vregion *vr, size_t size, size_t alignment);
 
 /**
- * @brief Allocate aligned memory from the specified virtual region.
- *
- * Allocate aligned memory from the specified virtual region using the
- * current allocation mode (lifetime or interim).
+ * @brief Allocate memory from the specified virtual region.
  *
  * @param[in] vr Pointer to the virtual region instance.
  * @param[in] size Size of memory to allocate in bytes.
- * @param[in] alignment Alignment of memory to allocate in bytes.
  * @return void* Pointer to the allocated memory, or NULL on failure.
  */
-__syscall void *vregion_alloc_align(struct vregion *vr, size_t size, size_t alignment);
+static inline void *vregion_alloc(struct vregion *vr, size_t size)
+{
+	return vregion_alloc_align(vr, size, 0);
+}
 
 /**
- * @brief like vregion_alloc_align() but allocates coherent memory
+ * @brief like vregion_alloc() but allocates coherent memory
  */
-__syscall void *vregion_alloc_coherent_align(struct vregion *vr, size_t size, size_t alignment);
+static inline void *vregion_alloc_coherent(struct vregion *vr, size_t size)
+{
+	return vregion_alloc_coherent_align(vr, size, 0);
+}
 
 /**
  * @brief Free memory allocated from the specified virtual region.

zephyr/lib/vregion.c

@@ -504,33 +504,6 @@ void *z_impl_vregion_alloc_align(struct vregion *vr,
 }
 EXPORT_SYMBOL(z_impl_vregion_alloc_align);
 
-/**
- * @brief Allocate memory from the virtual region.
- * @param[in] vr Pointer to the virtual region instance.
- * @param[in] size Size of the allocation.
- * @return void* Pointer to the allocated memory, or NULL on failure.
- */
-void *z_impl_vregion_alloc(struct vregion *vr, size_t size)
-{
-	return z_impl_vregion_alloc_align(vr, size, 0);
-}
-EXPORT_SYMBOL(z_impl_vregion_alloc);
-
-void *z_impl_vregion_alloc_coherent(struct vregion *vr, size_t size)
-{
-	size = ALIGN_UP(size, CONFIG_DCACHE_LINE_SIZE);
-
-	void *p = z_impl_vregion_alloc_align(vr, size, CONFIG_DCACHE_LINE_SIZE);
-
-	if (!p)
-		return NULL;
-
-	sys_cache_data_invd_range(p, size);
-
-	return sys_cache_uncached_ptr_get(p);
-}
-EXPORT_SYMBOL(z_impl_vregion_alloc_coherent);
-
 void *z_impl_vregion_alloc_coherent_align(struct vregion *vr, size_t size, size_t alignment)
 {
 	if (alignment < CONFIG_DCACHE_LINE_SIZE)

zephyr/syscall/vregion.c

@@ -6,24 +6,6 @@
 #include <zephyr/kernel.h>
 #include <zephyr/internal/syscall_handler.h>
 
-static inline void *z_vrfy_vregion_alloc(struct vregion *vr, size_t size)
-{
-	if (vregion_verify(vr))
-		return z_impl_vregion_alloc(vr, size);
-
-	return NULL;
-}
-#include <zephyr/syscalls/vregion_alloc_mrsh.c>
-
-static inline void *z_vrfy_vregion_alloc_coherent(struct vregion *vr, size_t size)
-{
-	if (vregion_verify(vr))
-		return z_impl_vregion_alloc_coherent(vr, size);
-
-	return NULL;
-}
-#include <zephyr/syscalls/vregion_alloc_coherent_mrsh.c>
-
 static inline void *z_vrfy_vregion_alloc_align(struct vregion *vr, size_t size, size_t alignment)
 {
 	if (vregion_verify(vr))