From 21fc1cc670fd1efe464f119c060d554a882403fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20S=C3=A6b=C3=B8?= Date: Wed, 16 Feb 2022 14:27:10 +0100 Subject: [PATCH] Bluetooth: Audio - remove superfluous check for BT_AUDIO from Kconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the check for BT_AUDIO from the Kconfig files that had it, for consistency (some files did not have it). This check is not required - all Kconfig.* files are sourced from the main Kconfig file _only_ if BT_AUDIO has been configured. As long as this is the case, it is not required to check in the files themselves. Signed-off-by: Asbjørn Sæbø --- subsys/bluetooth/audio/Kconfig.aics | 4 ---- subsys/bluetooth/audio/Kconfig.csis | 4 ---- subsys/bluetooth/audio/Kconfig.mcs | 4 ---- subsys/bluetooth/audio/Kconfig.mics | 4 ---- subsys/bluetooth/audio/Kconfig.otc | 4 ---- subsys/bluetooth/audio/Kconfig.vcs | 4 ---- subsys/bluetooth/audio/Kconfig.vocs | 4 ---- 7 files changed, 28 deletions(-) diff --git a/subsys/bluetooth/audio/Kconfig.aics b/subsys/bluetooth/audio/Kconfig.aics index 9e124ea40b7..9d5b6498e76 100644 --- a/subsys/bluetooth/audio/Kconfig.aics +++ b/subsys/bluetooth/audio/Kconfig.aics @@ -6,8 +6,6 @@ # SPDX-License-Identifier: Apache-2.0 # -if BT_AUDIO - ##################### Audio Input Control Service ##################### config BT_AICS_MAX_INSTANCE_COUNT @@ -74,5 +72,3 @@ config BT_DEBUG_AICS_CLIENT logs for the Bluetooth Audio functionality. endif # BT_AICS_CLIENT - -endif # BT_AUDIO diff --git a/subsys/bluetooth/audio/Kconfig.csis b/subsys/bluetooth/audio/Kconfig.csis index c5eac5c3d38..5a7874587d2 100644 --- a/subsys/bluetooth/audio/Kconfig.csis +++ b/subsys/bluetooth/audio/Kconfig.csis @@ -6,8 +6,6 @@ # SPDX-License-Identifier: Apache-2.0 # -if BT_AUDIO - #################### Coordinated Set Identification Service #################### config BT_CSIS @@ -114,5 +112,3 @@ config BT_DEBUG_CSIS_CRYPTO help Use this option to enable Coordinated Set Identification Service crypto functions debug logs for the Bluetooth Audio functionality. - -endif # BT_AUDIO diff --git a/subsys/bluetooth/audio/Kconfig.mcs b/subsys/bluetooth/audio/Kconfig.mcs index 44d9fbec9ac..402d199d215 100644 --- a/subsys/bluetooth/audio/Kconfig.mcs +++ b/subsys/bluetooth/audio/Kconfig.mcs @@ -6,8 +6,6 @@ # SPDX-License-Identifier: Apache-2.0 # -if BT_AUDIO - #### Media Control Service ################################ config BT_MCS @@ -203,5 +201,3 @@ config BT_DEBUG_MEDIA_PROXY Bluetooth Audio functionality. endif # BT_MCS || BT_MCC - -endif # BT_AUDIO diff --git a/subsys/bluetooth/audio/Kconfig.mics b/subsys/bluetooth/audio/Kconfig.mics index 9c71d92ea71..1fc273add64 100644 --- a/subsys/bluetooth/audio/Kconfig.mics +++ b/subsys/bluetooth/audio/Kconfig.mics @@ -6,8 +6,6 @@ # SPDX-License-Identifier: Apache-2.0 # -if BT_AUDIO - ##################### Microphone Input Control Service ##################### config BT_MICS @@ -82,5 +80,3 @@ config BT_DEBUG_MICS_CLIENT the Bluetooth Audio functionality. endif # BT_MICS_CLIENT - -endif # BT_AUDIO diff --git a/subsys/bluetooth/audio/Kconfig.otc b/subsys/bluetooth/audio/Kconfig.otc index 8b6ed17a1ab..5118b910f26 100644 --- a/subsys/bluetooth/audio/Kconfig.otc +++ b/subsys/bluetooth/audio/Kconfig.otc @@ -6,8 +6,6 @@ # SPDX-License-Identifier: Apache-2.0 # -if BT_AUDIO - #### Object Transfer Service Client ################################ config BT_OTC @@ -31,5 +29,3 @@ config BT_DEBUG_OTC Bluetooth Audio functionality. endif # BTC - -endif # BT_AUDIO diff --git a/subsys/bluetooth/audio/Kconfig.vcs b/subsys/bluetooth/audio/Kconfig.vcs index 61e3e832af5..0600cfadbc9 100644 --- a/subsys/bluetooth/audio/Kconfig.vcs +++ b/subsys/bluetooth/audio/Kconfig.vcs @@ -6,8 +6,6 @@ # SPDX-License-Identifier: Apache-2.0 # -if BT_AUDIO - ##################### Volume Control Service ##################### config BT_VCS @@ -112,5 +110,3 @@ config BT_DEBUG_VCS_CLIENT Bluetooth Audio functionality. endif # BT_VCS_CLIENT - -endif # BT_AUDIO diff --git a/subsys/bluetooth/audio/Kconfig.vocs b/subsys/bluetooth/audio/Kconfig.vocs index 5ceeab8ea83..1534f16c697 100644 --- a/subsys/bluetooth/audio/Kconfig.vocs +++ b/subsys/bluetooth/audio/Kconfig.vocs @@ -5,8 +5,6 @@ # SPDX-License-Identifier: Apache-2.0 # -if BT_AUDIO - ##################### Volume Offset Control Service ##################### config BT_VOCS_MAX_INSTANCE_COUNT @@ -74,5 +72,3 @@ config BT_DEBUG_VOCS_CLIENT logs for the Bluetooth Audio functionality. endif # BT_VOCS_CLIENT - -endif # BT_AUDIO