| From 7f40408f489575e886c6ea2f68902cd4dc4ade26 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 18 Sep 2019 21:59:02 +0200 |
| Subject: Bluetooth: btusb: avoid unused function warning |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| [ Upstream commit 42d22098127d6384f789107f59caae87d7520fc4 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/bluetooth/btusb.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c |
| index a9c35ebb30f8..23e606aaaea4 100644 |
| --- a/drivers/bluetooth/btusb.c |
| +++ b/drivers/bluetooth/btusb.c |
| @@ -3807,8 +3807,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; |
| @@ -3819,7 +3819,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 */ |
| -- |
| 2.20.1 |
| |
