Bluetooth: Controller: Remove redundant use of local variable

cvinayak · carlescufi · commit c3e6edd40217 · 2023-03-17T11:48:26.000+01:00
Remove redundant use of local variable chan_idx in the
lll_chan_iso_subevent() function.

Signed-off-by: Vinayak Kariappa Chettimada &lt;vich@nordicsemi.no&gt;
diff --git a/subsys/bluetooth/controller/ll_sw/lll_chan.c b/subsys/bluetooth/controller/ll_sw/lll_chan.c
@@ -127,7 +127,6 @@ uint8_t lll_chan_iso_subevent(uint16_t chan_id, uint8_t *chan_map,
 			      uint16_t *remap_idx)
 {
 	uint16_t prn_subevent_se;
-	uint8_t chan_idx;
 	uint8_t d;
 	uint8_t x;
 
@@ -145,10 +144,9 @@ uint8_t lll_chan_iso_subevent(uint16_t chan_id, uint8_t *chan_map,
 	}
 
 	*remap_idx = ((((uint32_t)prn_subevent_se * x) >> 16) +
-		d + *remap_idx) % chan_count;
-	chan_idx = chan_sel_remap(chan_map, *remap_idx);
+		      d + *remap_idx) % chan_count;
 
-	return chan_idx;
+	return chan_sel_remap(chan_map, *remap_idx);
 }
 #endif /* CONFIG_BT_CTLR_ISO */
 #endif /* CONFIG_BT_CTLR_CHAN_SEL_2 */

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,6 @@ uint8_t lll_chan_iso_subevent(uint16_t chan_id, uint8_t *chan_map,`
`127`	`127`	`uint16_t *remap_idx)`
`128`	`128`	`{`
`129`	`129`	`uint16_t prn_subevent_se;`
`130`		`- uint8_t chan_idx;`
`131`	`130`	`uint8_t d;`
`132`	`131`	`uint8_t x;`
`133`	`132`
`@@ -145,10 +144,9 @@ uint8_t lll_chan_iso_subevent(uint16_t chan_id, uint8_t *chan_map,`
`145`	`144`	`}`
`146`	`145`
`147`	`146`	`remap_idx = ((((uint32_t)prn_subevent_se x) >> 16) +`
`148`		`- d + *remap_idx) % chan_count;`
`149`		`- chan_idx = chan_sel_remap(chan_map, *remap_idx);`
	`147`	`+ d + *remap_idx) % chan_count;`
`150`	`148`
`151`		`- return chan_idx;`
	`149`	`+ return chan_sel_remap(chan_map, *remap_idx);`
`152`	`150`	`}`
`153`	`151`	`#endif /* CONFIG_BT_CTLR_ISO */`
`154`	`152`	`#endif /* CONFIG_BT_CTLR_CHAN_SEL_2 */`