[PATCH v1] Bluetooth: Replace dependency on SERIAL_DEV_BUS by selection

[PATCH v1] Bluetooth: Replace dependency on SERIAL_DEV_BUS by selection

[Andy Shevchenko]

The change restores build behaviour for old configurations when user
didn't know and thus didn't select SERIAL_DEV_BUS explicitly for given
HCI modules, such as hci_bcm.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/bluetooth/Kconfig | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 60e1c7d6986d..52dec0804b28 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -78,11 +78,6 @@ config BT_HCIUART
 	  Say Y here to compile support for Bluetooth UART devices into the
 	  kernel or say M to compile it as module (hci_uart).
 
-config BT_HCIUART_SERDEV
-	bool
-	depends on SERIAL_DEV_BUS && BT_HCIUART
-	default y
-
 config BT_HCIUART_H4
 	bool "UART (H4) protocol support"
 	depends on BT_HCIUART
@@ -96,8 +91,8 @@ config BT_HCIUART_H4
 config BT_HCIUART_NOKIA
 	tristate "UART Nokia H4+ protocol support"
 	depends on BT_HCIUART
-	depends on BT_HCIUART_SERDEV
 	depends on PM
+	select SERIAL_DEV_BUS
 	select BT_HCIUART_H4
 	select BT_BCM
 	help
@@ -134,7 +129,8 @@ config BT_HCIUART_ATH3K
 
 config BT_HCIUART_LL
 	bool "HCILL protocol support"
-	depends on BT_HCIUART_SERDEV
+	depends on BT_HCIUART
+	select SERIAL_DEV_BUS
 	help
 	  HCILL (HCI Low Level) is a serial protocol for communication
 	  between Bluetooth device and host. This protocol is required for
@@ -169,8 +165,8 @@ config BT_HCIUART_INTEL
 config BT_HCIUART_BCM
 	bool "Broadcom protocol support"
 	depends on BT_HCIUART
-	depends on BT_HCIUART_SERDEV
-	depends on (!ACPI || SERIAL_DEV_CTRL_TTYPORT)
+	depends on !ACPI || SERIAL_DEV_CTRL_TTYPORT
+	select SERIAL_DEV_BUS
 	select BT_HCIUART_H4
 	select BT_BCM
 	help
-- 
2.15.1

Re: [PATCH v1] Bluetooth: Replace dependency on SERIAL_DEV_BUS by selection

[Marcel Holtmann]

Hi Andy,

> The change restores build behaviour for old configurations when user
> didn't know and thus didn't select SERIAL_DEV_BUS explicitly for given
> HCI modules, such as hci_bcm.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/bluetooth/Kconfig | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
> index 60e1c7d6986d..52dec0804b28 100644
> --- a/drivers/bluetooth/Kconfig
> +++ b/drivers/bluetooth/Kconfig
> @@ -78,11 +78,6 @@ config BT_HCIUART
> 	  Say Y here to compile support for Bluetooth UART devices into the
> 	  kernel or say M to compile it as module (hci_uart).
> 
> -config BT_HCIUART_SERDEV
> -	bool
> -	depends on SERIAL_DEV_BUS && BT_HCIUART
> -	default y
> -
> config BT_HCIUART_H4
> 	bool "UART (H4) protocol support"
> 	depends on BT_HCIUART
> @@ -96,8 +91,8 @@ config BT_HCIUART_H4
> config BT_HCIUART_NOKIA
> 	tristate "UART Nokia H4+ protocol support"
> 	depends on BT_HCIUART
> -	depends on BT_HCIUART_SERDEV
> 	depends on PM
> +	select SERIAL_DEV_BUS
> 	select BT_HCIUART_H4
> 	select BT_BCM
> 	help

I have a dejavu feeling about this. Maybe it is better that Rob and Arnd comment and ACK this before we go this route.

Regards

Marcel