From 7fcb329951f57aac8c56cae4706b986a417ee765 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Wed, 25 Aug 2021 12:40:42 +0200 Subject: [PATCH] ipc: rpmsg_multi_instance: Fix wrong return value The rpmsg_mi_configure_shm() function is not returning anything and it is not marked as static. Fix this changing the return type to 'static void'. Signed-off-by: Carlo Caione --- subsys/ipc/rpmsg_multi_instance/rpmsg_multi_instance.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/subsys/ipc/rpmsg_multi_instance/rpmsg_multi_instance.c b/subsys/ipc/rpmsg_multi_instance/rpmsg_multi_instance.c index 254ded5be69..c9c012be3ea 100644 --- a/subsys/ipc/rpmsg_multi_instance/rpmsg_multi_instance.c +++ b/subsys/ipc/rpmsg_multi_instance/rpmsg_multi_instance.c @@ -99,7 +99,7 @@ static void ipm_callback(const struct device *dev, void *context, uint32_t id, v k_work_submit_to_queue(&ctx->ipm_work_q, &ctx->ipm_work); } -int rpmsg_mi_configure_shm(struct rpmsg_mi_ctx *ctx, const struct rpmsg_mi_ctx_cfg *cfg) +static void rpmsg_mi_configure_shm(struct rpmsg_mi_ctx *ctx, const struct rpmsg_mi_ctx_cfg *cfg) { size_t vring_size = VRING_SIZE_GET(cfg->shm->size); uintptr_t shm_addr = SHMEM_INST_ADDR_AUTOALLOC_GET(cfg->shm->addr, @@ -133,8 +133,6 @@ int rpmsg_mi_configure_shm(struct rpmsg_mi_ctx *ctx, const struct rpmsg_mi_ctx_c ctx->vring_rx_addr = shm_local_start_addr + rpmsg_reg_size; ctx->vring_tx_addr = ctx->vring_rx_addr + vring_region_size; - - return 0; } static int ept_cb(struct rpmsg_endpoint *ept, void *data, size_t len, uint32_t src, void *priv) @@ -233,11 +231,7 @@ int rpmsg_mi_ctx_init(struct rpmsg_mi_ctx *ctx, const struct rpmsg_mi_ctx_cfg *c sys_slist_init(&ctx->endpoints); /* Configure share memory */ - err = rpmsg_mi_configure_shm(ctx, cfg); - if (err) { - LOG_ERR("shmem configuration: failed - error code %d", err); - goto out; - } + rpmsg_mi_configure_shm(ctx, cfg); /* Libmetal setup */ err = metal_init(&metal_params);