Bluetooth: Controller: Revert use of Rule 85 MISRA-C-2012 R_14_04

Use of explicit `conn != NULL` increases code size, hence
revert previous commit to optimize code size.

Build command:
cmake -GNinja -DBOARD=nrf52833dk/nrf52833
 -DEXTRA_CONF_FILE=overlay-all-bt_ll_sw_split.conf
 -DDTC_OVERLAY_FILE=boards/nrf52833dk_nrf52833_df.overlay
 -DSNIPPET="bt-ll-sw-split" ../../samples/bluetooth/hci_uart
ninja

Memory region         Used Size  Region Size  %age Used
           FLASH:      284992 B       512 KB     54.36%
             RAM:      109752 B       128 KB     83.73%
        IDT_LIST:          0 GB        32 KB      0.00%

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>

Author: cvinayak

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central_iso.c

@@ -155,7 +155,7 @@ static int prepare_cb(struct lll_prepare_param *p)
 
 	/* Get reference to ACL context */
 	conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
-	LL_ASSERT(conn_lll != NULL);
+	LL_ASSERT(conn_lll);
 
 	/* Pick the event_count calculated in the ULL prepare */
 	cis_lll->event_count = cis_lll->event_count_prepare;
@@ -434,7 +434,7 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 		/* Get reference to ACL context */
 		const struct lll_conn *conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
 
-		LL_ASSERT(conn_lll != NULL);
+		LL_ASSERT(conn_lll);
 
 		if (conn_lll->enc_rx) {
 			radio_ccm_disable();
@@ -483,7 +483,7 @@ static void isr_tx(void *param)
 	/* Get reference to ACL context */
 	const struct lll_conn *conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
 
-	LL_ASSERT(conn_lll != NULL);
+	LL_ASSERT(conn_lll);
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
 	/* PHY */
@@ -589,7 +589,7 @@ static void isr_tx(void *param)
 
 		/* Get reference to ACL context */
 		evt_conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
-		LL_ASSERT(evt_conn_lll != NULL);
+		LL_ASSERT(evt_conn_lll);
 
 		/* Calculate the radio channel to use for next subevent */
 		data_chan_id = lll_chan_id(cis_lll->access_addr);
@@ -636,7 +636,7 @@ static void isr_tx(void *param)
 
 		/* Get reference to ACL context */
 		next_conn_lll = ull_conn_lll_get(next_cis_lll->acl_handle);
-		LL_ASSERT(next_conn_lll != NULL);
+		LL_ASSERT(next_conn_lll);
 
 		/* Calculate the radio channel to use for ISO event */
 		data_chan_id = lll_chan_id(next_cis_lll->access_addr);
@@ -777,7 +777,7 @@ static void isr_rx(void *param)
 			/* Get reference to ACL context */
 			const struct lll_conn *conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
 
-			LL_ASSERT(conn_lll != NULL);
+			LL_ASSERT(conn_lll);
 
 			/* If required, wait for CCM to finish
 			 */
@@ -866,7 +866,7 @@ static void isr_rx(void *param)
 
 		/* Get reference to ACL context */
 		next_conn_lll = ull_conn_lll_get(next_cis_lll->acl_handle);
-		LL_ASSERT(next_conn_lll != NULL);
+		LL_ASSERT(next_conn_lll);
 
 		/* Calculate CIS channel if not already calculated */
 		if (se_curr < cis_lll->nse) {
@@ -1043,7 +1043,7 @@ static void isr_prepare_subevent(void *param)
 	/* Get reference to ACL context */
 	const struct lll_conn *conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
 
-	LL_ASSERT(conn_lll != NULL);
+	LL_ASSERT(conn_lll);
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
 	/* PHY */

subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c

@@ -169,7 +169,7 @@ static int prepare_cb(struct lll_prepare_param *p)
 
 	/* Get reference to ACL context */
 	conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
-	LL_ASSERT(conn_lll != NULL);
+	LL_ASSERT(conn_lll);
 
 	/* Pick the event_count calculated in the ULL prepare */
 	cis_lll->event_count = cis_lll->event_count_prepare;
@@ -450,7 +450,7 @@ static void abort_cb(struct lll_prepare_param *prepare_param, void *param)
 		/* Get reference to ACL context */
 		const struct lll_conn *conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
 
-		LL_ASSERT(conn_lll != NULL);
+		LL_ASSERT(conn_lll);
 
 		if (conn_lll->enc_rx) {
 			radio_ccm_disable();
@@ -566,7 +566,7 @@ static void isr_rx(void *param)
 
 	/* Get reference to ACL context */
 	conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
-	LL_ASSERT(conn_lll != NULL);
+	LL_ASSERT(conn_lll);
 
 	if (crc_ok) {
 		struct node_rx_pdu *node_rx;
@@ -881,7 +881,7 @@ static void isr_tx(void *param)
 	/* Get reference to ACL context */
 	const struct lll_conn *conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
 
-	LL_ASSERT(conn_lll != NULL);
+	LL_ASSERT(conn_lll);
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
 	/* PHY */
@@ -1046,7 +1046,7 @@ static void isr_prepare_subevent(void *param)
 
 	/* Get reference to ACL context */
 	conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
-	LL_ASSERT(conn_lll != NULL);
+	LL_ASSERT(conn_lll);
 
 	/* Calculate the radio channel to use for next subevent
 	 */
@@ -1072,7 +1072,7 @@ static void isr_prepare_subevent_next_cis(void *param)
 
 	/* Get reference to ACL context */
 	conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
-	LL_ASSERT(conn_lll != NULL);
+	LL_ASSERT(conn_lll);
 
 	/* Event counter value,  0-15 bit of cisEventCounter */
 	event_counter = cis_lll->event_count;
@@ -1110,7 +1110,7 @@ static void isr_prepare_subevent_common(void *param)
 	/* Get reference to ACL context */
 	const struct lll_conn *conn_lll = ull_conn_lll_get(cis_lll->acl_handle);
 
-	LL_ASSERT(conn_lll != NULL);
+	LL_ASSERT(conn_lll);
 #endif /* CONFIG_BT_CTLR_LE_ENC */
 
 	/* PHY */

subsys/bluetooth/controller/ll_sw/ull.c

@@ -1686,7 +1686,7 @@ void ll_rx_mem_release(void **node_rx)
 				memq_link_t *link;
 
 				conn = ll_conn_get(rx_free->hdr.handle);
-				LL_ASSERT(conn != NULL);
+				LL_ASSERT(conn);
 
 				LL_ASSERT(!conn->lll.link_tx_free);
 				link = memq_deinit(&conn->lll.memq_tx.head,
@@ -2869,7 +2869,7 @@ static inline void rx_demux_rx(memq_link_t *link, struct node_rx_hdr *rx)
 		(void)memq_dequeue(memq_ull_rx.tail, &memq_ull_rx.head, NULL);
 
 		conn = ll_conn_get(rx->handle);
-		LL_ASSERT(conn != NULL);
+		LL_ASSERT(conn);
 
 		if (ull_cp_cc_awaiting_established(conn)) {
 			ull_cp_cc_established(conn, BT_HCI_ERR_SUCCESS);

subsys/bluetooth/controller/ll_sw/ull_central_iso.c

@@ -859,7 +859,7 @@ uint8_t ull_central_iso_setup(uint16_t cis_handle,
 
 	/* ACL connection of the new CIS */
 	conn = ll_conn_get(cis->lll.acl_handle);
-	LL_ASSERT(conn != NULL);
+	LL_ASSERT(conn);
 
 #if defined(CONFIG_BT_CTLR_JIT_SCHEDULING)
 	uint16_t event_counter;
@@ -983,7 +983,7 @@ int ull_central_iso_cis_offset_get(uint16_t cis_handle,
 	LL_ASSERT(cis);
 
 	conn = ll_conn_get(cis->lll.acl_handle);
-	LL_ASSERT(conn != NULL);
+	LL_ASSERT(conn);
 
 	/* `ull_conn_llcp()` (caller of this function) is called before `ull_ref_inc()` hence we do
 	 * not need to use `ull_conn_event_counter()`.
@@ -1063,7 +1063,7 @@ static void mfy_cig_offset_get(void *param)
 	offset_min_us += cig->sync_delay - cis->sync_delay;
 
 	conn = ll_conn_get(cis->lll.acl_handle);
-	LL_ASSERT(conn != NULL);
+	LL_ASSERT(conn);
 
 	/* Ensure the offset is not greater than the ACL interval, considering
 	 * the minimum CIS offset requirement.
@@ -1175,7 +1175,7 @@ static void mfy_cis_offset_get(void *param)
 	cig_remainder_us = remainder;
 
 	conn = ll_conn_get(cis->lll.acl_handle);
-	LL_ASSERT(conn != NULL);
+	LL_ASSERT(conn);
 
 	/* Add a tick for negative remainder and return positive remainder
 	 * value.

subsys/bluetooth/controller/ll_sw/ull_conn.c

@@ -192,7 +192,7 @@ struct ll_conn *ll_connected_get(uint16_t handle)
 	struct ll_conn *conn;
 
 	conn = ll_conn_get(handle);
-	if ((conn == NULL) || (conn->lll.handle != handle)) {
+	if (!conn || conn->lll.handle != handle) {
 		return NULL;
 	}
 
@@ -446,7 +446,7 @@ uint8_t ll_terminate_ind_send(uint16_t handle, uint8_t reason)
 
 				} else if (cis->group->state == CIG_STATE_INITIATING) {
 					conn = ll_connected_get(cis->lll.acl_handle);
-					LL_ASSERT(conn != NULL);
+					LL_ASSERT(conn);
 
 					/* CIS is not yet established - try to cancel procedure */
 					if (ull_cp_cc_cancel(conn)) {
@@ -807,7 +807,7 @@ struct lll_conn *ull_conn_lll_get(uint16_t handle)
 	struct ll_conn *conn;
 
 	conn = ll_conn_get(handle);
-	if (conn == NULL) {
+	if (!conn) {
 		return NULL;
 	}
 
@@ -1558,7 +1558,7 @@ void ull_conn_tx_ack(uint16_t handle, memq_link_t *link, struct node_tx *tx)
 		if (handle != LLL_HANDLE_INVALID) {
 			struct ll_conn *conn = ll_conn_get(handle);
 
-			LL_ASSERT(conn != NULL);
+			LL_ASSERT(conn);
 
 			ull_cp_tx_ack(conn, tx);
 		}
@@ -1571,7 +1571,7 @@ void ull_conn_tx_ack(uint16_t handle, memq_link_t *link, struct node_tx *tx)
 			LL_ASSERT(link->next);
 
 			conn = ll_connected_get(handle);
-			LL_ASSERT(conn != NULL);
+			LL_ASSERT(conn);
 
 			ull_cp_release_tx(conn, tx);
 
@@ -1856,7 +1856,7 @@ static inline void disable(uint16_t handle)
 	int err;
 
 	conn = ll_conn_get(handle);
-	LL_ASSERT(conn != NULL);
+	LL_ASSERT(conn);
 
 	err = ull_ticker_stop_with_mark(TICKER_ID_CONN_BASE + handle,
 					conn, &conn->lll);

subsys/bluetooth/controller/ll_sw/ull_conn_iso.c

@@ -485,7 +485,7 @@ void ull_conn_iso_done(struct node_rx_event_done *done)
 				if (!cis->event_expire) {
 					struct ll_conn *conn = ll_conn_get(cis->lll.acl_handle);
 
-					LL_ASSERT(conn != NULL);
+					LL_ASSERT(conn);
 
 					cis->event_expire = RADIO_CONN_EVENTS(
 							conn->supervision_timeout * 10U * 1000U,
@@ -532,7 +532,7 @@ void ull_conn_iso_done(struct node_rx_event_done *done)
 		struct ll_conn *conn;
 
 		conn = ll_connected_get(cis->lll.acl_handle);
-		LL_ASSERT(conn != NULL);
+		LL_ASSERT(conn);
 
 		ticker_status = ticker_update(TICKER_INSTANCE_ID_CTLR,
 					      TICKER_USER_ID_ULL_HIGH,
@@ -1257,7 +1257,7 @@ static void cis_disabled_cb(void *param)
 			ll_iso_stream_released_cb_t cis_released_cb;
 
 			conn = ll_conn_get(cis->lll.acl_handle);
-			LL_ASSERT(conn != NULL);
+			LL_ASSERT(conn);
 
 			cis_released_cb = cis->released_cb;
 			cis->released_cb = NULL;
@@ -1321,7 +1321,7 @@ static void cis_disabled_cb(void *param)
 				ll_rx_put_sched(node_terminate->hdr.link, node_terminate);
 			} else {
 				conn = ll_conn_get(cis->lll.acl_handle);
-				LL_ASSERT(conn != NULL);
+				LL_ASSERT(conn);
 
 				/* CIS was not established - complete the procedure with error */
 				if (ull_cp_cc_awaiting_established(conn)) {

subsys/bluetooth/controller/ll_sw/ull_iso.c

@@ -2025,7 +2025,7 @@ void ull_iso_resume_ticker_start(struct lll_event *resume_event,
 				cis = ll_conn_iso_stream_get(stream_handle);
 
 				conn = ll_conn_get(cis->lll.acl_handle);
-				LL_ASSERT(conn != NULL);
+				LL_ASSERT(conn);
 
 				phy = conn->lll.phy_rx;
 #endif /* CONFIG_BT_CTLR_CONN_ISO */

subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c

@@ -318,7 +318,7 @@ uint8_t ull_peripheral_iso_setup(struct pdu_data_llctrl_cis_ind *ind,
 	}
 
 	conn = ll_conn_get(cis->lll.acl_handle);
-	LL_ASSERT(conn != NULL);
+	LL_ASSERT(conn);
 
 	cis_offset = sys_get_le24(ind->cis_offset);