Bluetooth: btusb: avoid unused function warning
authorArnd Bergmann <arnd@arndb.de>
Wed, 18 Sep 2019 19:59:02 +0000 (21:59 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Wed, 16 Oct 2019 17:26:40 +0000 (19:26 +0200)
The btusb_rtl_cmd_timeout() function is used inside of an
ifdef, leading to a warning when this part is hidden
from the compiler:

drivers/bluetooth/btusb.c:530:13: error: unused function 'btusb_rtl_cmd_timeout' [-Werror,-Wunused-function]

Use an IS_ENABLED() check instead so the compiler can see
the code and then discard it silently.

Fixes: d7ef0d1e3968 ("Bluetooth: btusb: Use cmd_timeout to reset Realtek device")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/bluetooth/btusb.c

index 270e892c7c8ff5e7a3203d61ec7bf2f98fc5f359..0f1b99ff5aec70f40f712932ab971112fdcad057 100644 (file)
@@ -3814,8 +3814,8 @@ static int btusb_probe(struct usb_interface *intf,
                btusb_check_needs_reset_resume(intf);
        }
 
-#ifdef CONFIG_BT_HCIBTUSB_RTL
-       if (id->driver_info & BTUSB_REALTEK) {
+       if (IS_ENABLED(CONFIG_BT_HCIBTUSB_RTL) &&
+           (id->driver_info & BTUSB_REALTEK)) {
                hdev->setup = btrtl_setup_realtek;
                hdev->shutdown = btrtl_shutdown_realtek;
                hdev->cmd_timeout = btusb_rtl_cmd_timeout;
@@ -3826,7 +3826,6 @@ static int btusb_probe(struct usb_interface *intf,
                 */
                set_bit(BTUSB_WAKEUP_DISABLE, &data->flags);
        }
-#endif
 
        if (id->driver_info & BTUSB_AMP) {
                /* AMP controllers do not support SCO packets */