This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit eb0e6673064be27265426efe0be369a44a2b2d38 Author: Bowen Wang <[email protected]> AuthorDate: Mon Sep 8 17:10:14 2025 +0800 drivers/rpmsg: use a single exit point in two more helpers Coverity reports HIS_metric_violation (RETURN) for rpmsg_get_by_rdev() and rpmsg_get_current_wqueue(), which return from two places. Keep the result in a local variable and return once. No functional change. Signed-off-by: Bowen Wang <[email protected]> --- drivers/rpmsg/rpmsg.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/rpmsg/rpmsg.c b/drivers/rpmsg/rpmsg.c index acb5dc6a2b8..273b91d5b08 100644 --- a/drivers/rpmsg/rpmsg.c +++ b/drivers/rpmsg/rpmsg.c @@ -141,12 +141,15 @@ static struct rpmsg_wqueue_s g_rpmsg_wqueues[CONFIG_RPMSG_WQUEUE_NUMBER]; static inline FAR struct rpmsg_s * rpmsg_get_by_rdev(FAR struct rpmsg_device *rdev) { - if (!rdev) + FAR struct rpmsg_s *rpmsg = NULL; + + if (rdev) { - return NULL; + rpmsg = (FAR struct rpmsg_s *) + ((FAR char *)rdev - sizeof(struct rpmsg_s)); } - return (FAR struct rpmsg_s *)((FAR char *)rdev - sizeof(struct rpmsg_s)); + return rpmsg; } static int rpmsg_dev_ioctl_(FAR struct rpmsg_s *rpmsg, int cmd, @@ -287,17 +290,19 @@ static FAR struct rpmsg_wqueue_s * rpmsg_get_current_wqueue(FAR struct rpmsg_s *rpmsg) { FAR struct rpmsg_wqueue_s *wqueues = rpmsg_get_wqueues(rpmsg); + FAR struct rpmsg_wqueue_s *wqueue = NULL; int i; for (i = 0; i < CONFIG_RPMSG_WQUEUE_NUMBER; i++) { if (work_queue_in_queue(wqueues[i].kwqueue)) { - return &wqueues[i]; + wqueue = &wqueues[i]; + break; } } - return NULL; + return wqueue; } static void rpmsg_rx_worker(FAR void *arg)
