From af4527e1310d754d0e712f2675b407c75fbfb70f Mon Sep 17 00:00:00 2001 From: Pisit Sawangvonganan Date: Wed, 18 Sep 2024 15:02:55 +0700 Subject: [PATCH] style: subsys: adjust `return` usage in `void functions` For code clarity, this commit adjusts the use of `return` statements in functions with a void return type as follows: - Transform `return foo();` into separate statements: `foo();` `return;` - Remove unnecessary `return` statements when they don't affect control flow. Signed-off-by: Pisit Sawangvonganan --- .../controller/ll_sw/nordic/lll/lll_adv.c | 2 +- .../controller/ll_sw/openisa/lll/lll_adv.c | 2 +- subsys/bluetooth/controller/ll_sw/ull_conn.c | 2 +- subsys/logging/log_msg.c | 2 +- .../backends/ec_host_cmd_backend_shi_npcx.c | 30 ++++++++++++------- subsys/net/lib/dhcpv4/dhcpv4.c | 2 +- subsys/net/lib/lwm2m/lwm2m_message_handling.c | 2 +- subsys/net/lib/sockets/getaddrinfo.c | 3 +- subsys/net/lib/sockets/socket_offload.c | 2 +- subsys/shell/backends/shell_telnet.c | 12 +++++--- 10 files changed, 37 insertions(+), 22 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c index c28776f37c5..a4b6d0dd3ad 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c @@ -1382,7 +1382,7 @@ static void isr_done(void *param) err = isr_close_adv_mesh(); if (err) { - return 0; + return; } } #endif /* CONFIG_BT_HCI_MESH_EXT */ diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c index 54d7c29b9e1..96b687aeca1 100644 --- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c +++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c @@ -716,7 +716,7 @@ static void isr_done(void *param) err = isr_close_adv_mesh(); if (err) { - return 0; + return; } } #endif /* CONFIG_BT_HCI_MESH_EXT */ diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c index 94bbc2ea9d8..50fe53127cc 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_conn.c +++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c @@ -2344,7 +2344,7 @@ static inline void dle_max_time_get(struct ll_conn *conn, uint16_t *max_rx_time, void ull_dle_max_time_get(struct ll_conn *conn, uint16_t *max_rx_time, uint16_t *max_tx_time) { - return dle_max_time_get(conn, max_rx_time, max_tx_time); + dle_max_time_get(conn, max_rx_time, max_tx_time); } /* diff --git a/subsys/logging/log_msg.c b/subsys/logging/log_msg.c index e6534998c50..b2b1f561238 100644 --- a/subsys/logging/log_msg.c +++ b/subsys/logging/log_msg.c @@ -337,7 +337,7 @@ static inline void z_vrfy_z_log_msg_static_create(const void *source, const struct log_msg_desc desc, uint8_t *package, const void *data) { - return z_impl_z_log_msg_static_create(source, desc, package, data); + z_impl_z_log_msg_static_create(source, desc, package, data); } #include #endif diff --git a/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_shi_npcx.c b/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_shi_npcx.c index df79c819c5d..7d446f4a39a 100644 --- a/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_shi_npcx.c +++ b/subsys/mgmt/ec_host_cmd/backends/ec_host_cmd_backend_shi_npcx.c @@ -417,7 +417,8 @@ static void shi_npcx_handle_host_package(const struct device *dev) /* Read remaining bytes from input buffer */ if (!shi_npcx_read_inbuf_wait(dev, remain_bytes)) { - return shi_npcx_bad_received_data(dev); + shi_npcx_bad_received_data(dev); + return; } /* Move to processing state */ @@ -464,7 +465,8 @@ static void shi_npcx_parse_header(const struct device *dev) /* Wait for version, command, length bytes */ if (!shi_npcx_read_inbuf_wait(dev, 3)) { - return shi_npcx_bad_received_data(dev); + shi_npcx_bad_received_data(dev); + return; } if (data->in_msg[0] == EC_HOST_REQUEST_VERSION) { @@ -480,13 +482,15 @@ static void shi_npcx_parse_header(const struct device *dev) /* Wait for the rest of the command header */ if (!shi_npcx_read_inbuf_wait(dev, sizeof(*r) - 3)) { - return shi_npcx_bad_received_data(dev); + shi_npcx_bad_received_data(dev); + return; } /* Check how big the packet should be */ pkt_size = shi_npcx_host_request_expected_size(r); if (pkt_size == 0 || pkt_size > sizeof(data->in_msg)) { - return shi_npcx_bad_received_data(dev); + shi_npcx_bad_received_data(dev); + return; } /* Computing total bytes need to receive */ @@ -495,7 +499,8 @@ static void shi_npcx_parse_header(const struct device *dev) shi_npcx_handle_host_package(dev); } else { /* Invalid version number */ - return shi_npcx_bad_received_data(dev); + shi_npcx_bad_received_data(dev); + return; } } @@ -632,7 +637,8 @@ static void shi_npcx_handle_input_buf_half_full(const struct device *dev) if (data->state == SHI_STATE_RECEIVING) { /* Read data from input to msg buffer */ shi_npcx_read_half_inbuf(dev); - return shi_npcx_handle_host_package(dev); + shi_npcx_handle_host_package(dev); + return; } else if (data->state == SHI_STATE_SENDING) { /* Write data from msg buffer to output buffer */ if (data->tx_buf == inst->OBUF + SHI_OBUF_FULL_SIZE) { @@ -658,7 +664,8 @@ static void shi_npcx_handle_input_buf_full(const struct device *dev) shi_npcx_read_half_inbuf(dev); /* Read to bottom address again */ data->rx_buf = inst->IBUF; - return shi_npcx_handle_host_package(dev); + shi_npcx_handle_host_package(dev); + return; } else if (data->state == SHI_STATE_SENDING) { /* Write data from msg buffer to output buffer */ if (data->tx_buf == inst->OBUF + SHI_OBUF_HALF_SIZE) { @@ -729,7 +736,8 @@ static void shi_npcx_isr(const struct device *dev) * Mark not ready to abort next transaction */ LOG_DBG("CSH-"); - return shi_npcx_handle_cs_deassert(dev); + shi_npcx_handle_cs_deassert(dev); + return; } #endif @@ -752,7 +760,8 @@ static void shi_npcx_isr(const struct device *dev) * Transaction is processing. */ if (IS_BIT_SET(stat, NPCX_EVSTAT_IBHF)) { - return shi_npcx_handle_input_buf_half_full(dev); + shi_npcx_handle_input_buf_half_full(dev); + return; } /* @@ -760,7 +769,8 @@ static void shi_npcx_isr(const struct device *dev) * Transaction is processing. */ if (IS_BIT_SET(stat, NPCX_EVSTAT_IBF)) { - return shi_npcx_handle_input_buf_full(dev); + shi_npcx_handle_input_buf_full(dev); + return; } } diff --git a/subsys/net/lib/dhcpv4/dhcpv4.c b/subsys/net/lib/dhcpv4/dhcpv4.c index 1c2df3d7204..4b3f60a86c1 100644 --- a/subsys/net/lib/dhcpv4/dhcpv4.c +++ b/subsys/net/lib/dhcpv4/dhcpv4.c @@ -1813,7 +1813,7 @@ int net_dhcpv4_remove_option_vendor_callback(struct net_dhcpv4_option_callback * void net_dhcpv4_start(struct net_if *iface) { - return dhcpv4_start_internal(iface, true); + dhcpv4_start_internal(iface, true); } void net_dhcpv4_stop(struct net_if *iface) diff --git a/subsys/net/lib/lwm2m/lwm2m_message_handling.c b/subsys/net/lib/lwm2m/lwm2m_message_handling.c index 1b136fd8fdc..0b5750107cd 100644 --- a/subsys/net/lib/lwm2m/lwm2m_message_handling.c +++ b/subsys/net/lib/lwm2m/lwm2m_message_handling.c @@ -2812,7 +2812,7 @@ void lwm2m_udp_receive(struct lwm2m_ctx *client_ctx, uint8_t *buf, uint16_t buf_ if (has_block2 && IS_ENABLED(CONFIG_LWM2M_COAP_BLOCK_TRANSFER)) { msg = find_ongoing_block2_tx(); if (msg) { - return handle_ongoing_block2_tx(msg, &response); + handle_ongoing_block2_tx(msg, &response); } return; } diff --git a/subsys/net/lib/sockets/getaddrinfo.c b/subsys/net/lib/sockets/getaddrinfo.c index 145b3d1c762..86ee417d929 100644 --- a/subsys/net/lib/sockets/getaddrinfo.c +++ b/subsys/net/lib/sockets/getaddrinfo.c @@ -472,7 +472,8 @@ int zsock_getaddrinfo(const char *host, const char *service, void zsock_freeaddrinfo(struct zsock_addrinfo *ai) { if (IS_ENABLED(CONFIG_NET_SOCKETS_OFFLOAD)) { - return socket_offload_freeaddrinfo(ai); + socket_offload_freeaddrinfo(ai); + return; } free(ai); diff --git a/subsys/net/lib/sockets/socket_offload.c b/subsys/net/lib/sockets/socket_offload.c index 2363e0f18d9..b6c2ef4fd64 100644 --- a/subsys/net/lib/sockets/socket_offload.c +++ b/subsys/net/lib/sockets/socket_offload.c @@ -37,5 +37,5 @@ void socket_offload_freeaddrinfo(struct zsock_addrinfo *res) __ASSERT_NO_MSG(dns_offload); __ASSERT_NO_MSG(dns_offload->freeaddrinfo); - return dns_offload->freeaddrinfo(res); + dns_offload->freeaddrinfo(res); } diff --git a/subsys/shell/backends/shell_telnet.c b/subsys/shell/backends/shell_telnet.c index 64afba96e12..b862f515856 100644 --- a/subsys/shell/backends/shell_telnet.c +++ b/subsys/shell/backends/shell_telnet.c @@ -480,7 +480,8 @@ static void telnet_server_cb(struct k_work *work) NET_ERR("Telnet socket %d error (%d)", evt->event.fd, sock_error); if (evt->event.fd == sh_telnet->fds[SOCK_ID_CLIENT].fd) { - return telnet_end_client_connection(); + telnet_end_client_connection(); + return; } goto error; @@ -491,11 +492,14 @@ static void telnet_server_cb(struct k_work *work) } if (evt->event.fd == sh_telnet->fds[SOCK_ID_IPV4_LISTEN].fd) { - return telnet_accept(&sh_telnet->fds[SOCK_ID_IPV4_LISTEN]); + telnet_accept(&sh_telnet->fds[SOCK_ID_IPV4_LISTEN]); + return; } else if (evt->event.fd == sh_telnet->fds[SOCK_ID_IPV6_LISTEN].fd) { - return telnet_accept(&sh_telnet->fds[SOCK_ID_IPV6_LISTEN]); + telnet_accept(&sh_telnet->fds[SOCK_ID_IPV6_LISTEN]); + return; } else if (evt->event.fd == sh_telnet->fds[SOCK_ID_CLIENT].fd) { - return telnet_recv(&sh_telnet->fds[SOCK_ID_CLIENT]); + telnet_recv(&sh_telnet->fds[SOCK_ID_CLIENT]); + return; } NET_ERR("Unexpected FD received for telnet, restarting service.");