diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2019-09-18 21:59:02 +0200 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2019-10-16 19:26:40 +0200 |
| commit | 42d22098127d6384f789107f59caae87d7520fc4 (patch) | |
| tree | 2d58e8971ffbb1d9b6cd91d009889c7716d88285 /drivers/bluetooth | |
| parent | Bluetooth: btusb: print FW version after FW download (diff) | |
| download | linux-dev-42d22098127d6384f789107f59caae87d7520fc4.tar.xz linux-dev-42d22098127d6384f789107f59caae87d7520fc4.zip | |
Bluetooth: btusb: avoid unused function warning
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>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 270e892c7c8f..0f1b99ff5aec 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -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 */ |