Bluetooth: L2CAP_BR: Code format

lylezhu2012 · kartben · commit 218de8dc676c · 2025-03-14T05:47:48.000+01:00
Change ```#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
#if defined(CONFIG_BT_L2CAP_LOG_LEVEL_DBG)```
to `#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) &amp;&amp;
defined(CONFIG_BT_L2CAP_LOG_LEVEL_DBG)`.

Signed-off-by: Lyle Zhu &lt;lyle.zhu@nxp.com&gt;
diff --git a/subsys/bluetooth/host/classic/l2cap_br.c b/subsys/bluetooth/host/classic/l2cap_br.c
@@ -930,8 +930,7 @@ static int l2cap_br_conn_req_reply(struct bt_l2cap_chan *chan, uint16_t result)
 	return 0;
 }
 
-#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
-#if defined(CONFIG_BT_L2CAP_LOG_LEVEL_DBG)
+#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) && defined(CONFIG_BT_L2CAP_LOG_LEVEL_DBG)
 void bt_l2cap_br_chan_set_state_debug(struct bt_l2cap_chan *chan,
 				   bt_l2cap_chan_state_t state,
 				   const char *func, int line)
@@ -983,8 +982,7 @@ void bt_l2cap_br_chan_set_state(struct bt_l2cap_chan *chan,
 {
 	BR_CHAN(chan)->state = state;
 }
-#endif /* CONFIG_BT_L2CAP_LOG_LEVEL_DBG */
-#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */
+#endif /* CONFIG_BT_L2CAP_LOG_LEVEL_DBG && CONFIG_BT_L2CAP_DYNAMIC_CHANNEL*/
 
 void bt_l2cap_br_chan_del(struct bt_l2cap_chan *chan)
 {

Original file line number	Diff line number	Diff line change
`@@ -930,8 +930,7 @@ static int l2cap_br_conn_req_reply(struct bt_l2cap_chan *chan, uint16_t result)`
`930`	`930`	`return 0;`
`931`	`931`	`}`
`932`	`932`
`933`		`-#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)`
`934`		`-#if defined(CONFIG_BT_L2CAP_LOG_LEVEL_DBG)`
	`933`	`+#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL) && defined(CONFIG_BT_L2CAP_LOG_LEVEL_DBG)`
`935`	`934`	`void bt_l2cap_br_chan_set_state_debug(struct bt_l2cap_chan *chan,`
`936`	`935`	`bt_l2cap_chan_state_t state,`
`937`	`936`	`const char *func, int line)`
`@@ -983,8 +982,7 @@ void bt_l2cap_br_chan_set_state(struct bt_l2cap_chan *chan,`
`983`	`982`	`{`
`984`	`983`	`BR_CHAN(chan)->state = state;`
`985`	`984`	`}`
`986`		`-#endif /* CONFIG_BT_L2CAP_LOG_LEVEL_DBG */`
`987`		`-#endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */`
	`985`	`+#endif /* CONFIG_BT_L2CAP_LOG_LEVEL_DBG && CONFIG_BT_L2CAP_DYNAMIC_CHANNEL*/`
`988`	`986`
`989`	`987`	`void bt_l2cap_br_chan_del(struct bt_l2cap_chan *chan)`
`990`	`988`	`{`