Bluetooth: l2cap: remove ambiguous naming

jori-nordic · carlescufi · commit 109c47639e73 · 2022-09-26T11:05:04.000+02:00
`l2cap_tx_meta_data` is also a function-like macro.

Signed-off-by: Jonathan Rico &lt;jonathan.rico@nordicsemi.no&gt;
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
@@ -76,7 +76,7 @@ struct l2cap_tx_meta {
 	struct l2cap_tx_meta_data *data;
 };
 
-static struct l2cap_tx_meta_data l2cap_tx_meta_data[CONFIG_BT_CONN_TX_MAX];
+static struct l2cap_tx_meta_data l2cap_tx_meta_data_storage[CONFIG_BT_CONN_TX_MAX];
 K_FIFO_DEFINE(free_l2cap_tx_meta_data);
 
 static struct l2cap_tx_meta_data *alloc_tx_meta_data(void)
@@ -2706,8 +2706,8 @@ void bt_l2cap_init(void)
 	}
 
 #if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
-	for (size_t i = 0; i < ARRAY_SIZE(l2cap_tx_meta_data); i++) {
-		k_fifo_put(&free_l2cap_tx_meta_data, &l2cap_tx_meta_data[i]);
+	for (size_t i = 0; i < ARRAY_SIZE(l2cap_tx_meta_data_storage); i++) {
+		k_fifo_put(&free_l2cap_tx_meta_data, &l2cap_tx_meta_data_storage[i]);
 	}
 #endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */
 }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ struct l2cap_tx_meta {`
`76`	`76`	`struct l2cap_tx_meta_data *data;`
`77`	`77`	`};`
`78`	`78`
`79`		`-static struct l2cap_tx_meta_data l2cap_tx_meta_data[CONFIG_BT_CONN_TX_MAX];`
	`79`	`+static struct l2cap_tx_meta_data l2cap_tx_meta_data_storage[CONFIG_BT_CONN_TX_MAX];`
`80`	`80`	`K_FIFO_DEFINE(free_l2cap_tx_meta_data);`
`81`	`81`
`82`	`82`	`static struct l2cap_tx_meta_data *alloc_tx_meta_data(void)`
`@@ -2706,8 +2706,8 @@ void bt_l2cap_init(void)`
`2706`	`2706`	`}`
`2707`	`2707`
`2708`	`2708`	`#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)`
`2709`		`- for (size_t i = 0; i < ARRAY_SIZE(l2cap_tx_meta_data); i++) {`
`2710`		`- k_fifo_put(&free_l2cap_tx_meta_data, &l2cap_tx_meta_data[i]);`
	`2709`	`+ for (size_t i = 0; i < ARRAY_SIZE(l2cap_tx_meta_data_storage); i++) {`
	`2710`	`+ k_fifo_put(&free_l2cap_tx_meta_data, &l2cap_tx_meta_data_storage[i]);`
`2711`	`2711`	`}`
`2712`	`2712`	`#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */`
`2713`	`2713`	`}`