[nrf noup] Bluetooth: Controller: Fix use of HAS_BT_CTLR with BT_CTLR

Fix use of HAS_BT_CTLR with BT_CTLR due to previous cherry pick
commit.

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

Author: cvinayak

subsys/bluetooth/common/Kconfig

@@ -203,11 +203,11 @@ config BT_BUF_CMD_TX_SIZE
 config BT_BUF_CMD_TX_COUNT
 	# This option is only visible for a user when Host and Controller are build together, or for
 	# Host-only builds.
-	int "Number of HCI command buffers" if !BT_HCI_RAW || !HAS_BT_CTLR
+	int "Number of HCI command buffers" if !BT_HCI_RAW || !BT_CTLR
 	# This option is present when Host and Controller are build together, or
 	# for Host only builds, or when Controller-to-Host ACL data flow control
 	# is disabled.
-	depends on !BT_HCI_RAW || !HAS_BT_CTLR || !BT_HCI_ACL_FLOW_CONTROL
+	depends on !BT_HCI_RAW || !BT_CTLR || !BT_HCI_ACL_FLOW_CONTROL
 	# The Mesh stack usage in applications and tests can start both advertising and scanning in
 	# parallel. Also, when BT_MESH_WORKQ_SYS is enabled, the Mesh stack is starting Extended
 	# Advertising in the receive callback run in the system work queue and as the Host also uses

subsys/bluetooth/common/hci_common_internal.h

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#if !defined(CONFIG_BT_HCI_RAW) || !defined(CONFIG_HAS_BT_CTLR) || \
+#if !defined(CONFIG_BT_HCI_RAW) || !defined(CONFIG_BT_CTLR) || \
 	!defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
 /* Following build configurations use configurable CONFIG_BT_BUF_CMD_TX_COUNT:
  * 1. Host + Controller build with and without Controller to Host data flow control, or
@@ -20,11 +20,11 @@
 #define BT_BUF_CMD_TX_AUTO_DATA_LEN_UPDATE COND_CODE_1(CONFIG_BT_AUTO_DATA_LEN_UPDATE, (1), (0))
 
 #else /* CONFIG_BT_HCI_RAW */
-#if defined(CONFIG_HAS_BT_CTLR)
+#if defined(CONFIG_BT_CTLR)
 /* Controller-only build need no additional HCI command buffers */
 BUILD_ASSERT((CONFIG_BT_BUF_CMD_TX_COUNT == CONFIG_BT_CTLR_HCI_NUM_CMD_PKT_MAX),
 	     "Mismatch in allocated HCI command buffers compared to Controller supported value.");
-#endif /* CONFIG_HAS_BT_CTLR */
+#endif /* CONFIG_BT_CTLR */
 
 /* Controller-only build do not enqueue auto initiated HCI commands */
 #define BT_BUF_CMD_TX_REMOTE_VERSION       0