rpmsg_virtio: move RPMSG_VIRTIO_DEFAULT_CONFIG to private location

and define it to NULL when VIRTIO_SLAVE_ONLY is defined to save space Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
OpenAMP · Jan 24, 2022 · 3531221 · 3531221
1 parent a12d03c
commit 3531221
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/lib/include/openamp/rpmsg_virtio.h b/lib/include/openamp/rpmsg_virtio.h
@@ -55,13 +55,6 @@ struct rpmsg_virtio_config {
 	uint32_t r2h_buf_size;
 };
 
-/* Default configuration */
-#define RPMSG_VIRTIO_DEFAULT_CONFIG                \
-	((const struct rpmsg_virtio_config) {       \
-		.h2r_buf_size = RPMSG_BUFFER_SIZE,  \
-		.r2h_buf_size = RPMSG_BUFFER_SIZE,  \
-	})
-
 /**
  * struct rpmsg_virtio_device - representation of a rpmsg device based on virtio
  * @rdev: rpmsg device, first property in the struct

diff --git a/lib/rpmsg/rpmsg_virtio.c b/lib/rpmsg/rpmsg_virtio.c
@@ -25,6 +25,18 @@
 /* Time to wait - In multiple of 1 msecs. */
 #define RPMSG_TICKS_PER_INTERVAL                1000
 
+
+/* Default configuration */
+#ifndef VIRTIO_SLAVE_ONLY
+#define RPMSG_VIRTIO_DEFAULT_CONFIG                \
+	(&(const struct rpmsg_virtio_config) {     \
+		.h2r_buf_size = RPMSG_BUFFER_SIZE, \
+		.r2h_buf_size = RPMSG_BUFFER_SIZE, \
+	})
+#else
+#define RPMSG_VIRTIO_DEFAULT_CONFIG          NULL
+#endif
+
 #ifndef VIRTIO_SLAVE_ONLY
 metal_weak void *
 rpmsg_virtio_shm_pool_get_buffer(struct rpmsg_virtio_shm_pool *shpool,
@@ -613,7 +625,7 @@ int rpmsg_init_vdev(struct rpmsg_virtio_device *rvdev,
 		    struct rpmsg_virtio_shm_pool *shpool)
 {
 	return rpmsg_init_vdev_with_config(rvdev, vdev, ns_bind_cb, shm_io,
-			   shpool, &RPMSG_VIRTIO_DEFAULT_CONFIG);
+			   shpool, RPMSG_VIRTIO_DEFAULT_CONFIG);
 }
 
 int rpmsg_init_vdev_with_config(struct rpmsg_virtio_device *rvdev,