Bluetooth: try to improve CONFIG_SERIAL_DEV_BUS dependency

With CONFIG_SERIAL_DEV_BUS=m, the hci_serdev.o file does not actually
get built into hci_uart.o as the Makefile doesn't pick it up, leading
to a link error with anything referring to it:

ERROR: "hci_uart_register_device" [drivers/bluetooth/hci_nokia.ko] undefined!
scripts/Makefile.modpost:91: recipe for target '__modpost' failed

Changing this in the Makefile would cause another problem when
hci_uart itself is built-in and cannot reference symbols from the
serdev module.

This tries to address both problems by introducing a new hidden
Kconfig symbol that controls both the compilation of hci_serdev.o
and whether the Nokia driver can be selected. This seems to address
the problem for me, though there might be a better way to do it.

Fixes: 7bb318680e86 ("Bluetooth: add nokia driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index 8aafbed9e160d34c54e31124e863f9b8eab2cb81..737d93ef27c5da8b36552bd09409467c3fb38660 100644 (file)
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -76,6 +76,12 @@ 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
+       depends on SERIAL_DEV_BUS=y || SERIAL_DEV_BUS=BT_HCIUART
+       default y
+
 config BT_HCIUART_H4
        bool "UART (H4) protocol support"
        depends on BT_HCIUART
@@ -89,7 +95,7 @@ config BT_HCIUART_H4
 config BT_HCIUART_NOKIA
        tristate "UART Nokia H4+ protocol support"
        depends on BT_HCIUART
-       depends on SERIAL_DEV_BUS
+       depends on BT_HCIUART_SERDEV
        depends on PM
        help
          Nokia H4+ is serial protocol for communication between Bluetooth

diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
index a7f237320f4b845686537ac70f0b97749f09a79e..e693ca6eeed9267d53f3eae0386bf90643d25cb3 100644 (file)
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -31,7 +31,7 @@ btmrvl-y                      := btmrvl_main.o
 btmrvl-$(CONFIG_DEBUG_FS)      += btmrvl_debugfs.o
 
 hci_uart-y                             := hci_ldisc.o
-hci_uart-$(CONFIG_SERIAL_DEV_BUS)      += hci_serdev.o
+hci_uart-$(CONFIG_BT_HCIUART_SERDEV)   += hci_serdev.o
 hci_uart-$(CONFIG_BT_HCIUART_H4)       += hci_h4.o
 hci_uart-$(CONFIG_BT_HCIUART_BCSP)     += hci_bcsp.o
 hci_uart-$(CONFIG_BT_HCIUART_LL)       += hci_ll.o