Bluetooth: host: fix warning on unused function

pabigot · jhedberg · commit cca0b79c2754 · 2020-05-10T11:07:35.000+03:00
get_phy is referenced by BT_EXT_ADV only when BT_OBSERVER is also
selected.  Avoid defined-but-not-used warnings in that situation.

Signed-off-by: Peter A. Bigot &lt;pab@pabigot.com&gt;
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
@@ -1261,7 +1261,8 @@ static int hci_le_read_max_data_len(u16_t *tx_octets, u16_t *tx_time)
 	return 0;
 }
 
-#if defined(CONFIG_BT_EXT_ADV) || defined(CONFIG_BT_USER_PHY_UPDATE)
+#if (defined(CONFIG_BT_OBSERVER) && defined(CONFIG_BT_EXT_ADV)) \
+	|| defined(CONFIG_BT_USER_PHY_UPDATE)
 static u8_t get_phy(u8_t hci_phy)
 {
 	switch (hci_phy) {
@@ -1275,7 +1276,7 @@ static u8_t get_phy(u8_t hci_phy)
 		return 0;
 	}
 }
-#endif /* defined(CONFIG_BT_EXT_ADV) || defined(CONFIG_BT_USER_PHY_UPDATE) */
+#endif /* (BT_OBSERVER && BT_EXT_ADV) || USER_PHY_UPDATE */
 
 #if defined(CONFIG_BT_CONN)
 static void hci_acl(struct net_buf *buf)

Original file line number	Diff line number	Diff line change
`@@ -1261,7 +1261,8 @@ static int hci_le_read_max_data_len(u16_t tx_octets, u16_t tx_time)`
`1261`	`1261`	`return 0;`
`1262`	`1262`	`}`
`1263`	`1263`
`1264`		`-#if defined(CONFIG_BT_EXT_ADV) \|\| defined(CONFIG_BT_USER_PHY_UPDATE)`
	`1264`	`+#if (defined(CONFIG_BT_OBSERVER) && defined(CONFIG_BT_EXT_ADV)) \`
	`1265`	`+ \|\| defined(CONFIG_BT_USER_PHY_UPDATE)`
`1265`	`1266`	`static u8_t get_phy(u8_t hci_phy)`
`1266`	`1267`	`{`
`1267`	`1268`	`switch (hci_phy) {`
`@@ -1275,7 +1276,7 @@ static u8_t get_phy(u8_t hci_phy)`
`1275`	`1276`	`return 0;`
`1276`	`1277`	`}`
`1277`	`1278`	`}`
`1278`		`-#endif /* defined(CONFIG_BT_EXT_ADV) \|\| defined(CONFIG_BT_USER_PHY_UPDATE) */`
	`1279`	`+#endif /* (BT_OBSERVER && BT_EXT_ADV) \|\| USER_PHY_UPDATE */`
`1279`	`1280`
`1280`	`1281`	`#if defined(CONFIG_BT_CONN)`
`1281`	`1282`	`static void hci_acl(struct net_buf *buf)`