Skip to content

Commit 7a8c6fb

Browse files
arndbVudentz
authored andcommitted
Bluetooth: btmtk: remove #ifdef around declarations
The caller of these functions in btusb.c is guarded with an if(IS_ENABLED()) style check, so dead code is left out, but the declarations are still needed at compile time: drivers/bluetooth/btusb.c: In function 'btusb_mtk_reset': drivers/bluetooth/btusb.c:2705:15: error: implicit declaration of function 'btmtk_usb_subsys_reset' [-Wimplicit-function-declaration] 2705 | err = btmtk_usb_subsys_reset(hdev, btmtk_data->dev_id); | ^~~~~~~~~~~~~~~~~~~~~~ drivers/bluetooth/btusb.c: In function 'btusb_send_frame_mtk': drivers/bluetooth/btusb.c:2720:23: error: implicit declaration of function 'alloc_mtk_intr_urb' [-Wimplicit-function-declaration] 2720 | urb = alloc_mtk_intr_urb(hdev, skb, btusb_tx_complete); | ^~~~~~~~~~~~~~~~~~ drivers/bluetooth/btusb.c:2720:21: error: assignment to 'struct urb *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 2720 | urb = alloc_mtk_intr_urb(hdev, skb, btusb_tx_complete); | ^ Fixes: f0c83a2 ("Bluetooth: btmtk: Fix btmtk.c undefined reference build error") Signed-off-by: Arnd Bergmann <[email protected]> Reviewed-by: AngeloGioacchino Del Regno <[email protected]> Signed-off-by: Luiz Augusto von Dentz <[email protected]>
1 parent 61f7a8f commit 7a8c6fb

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

drivers/bluetooth/btmtk.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ int btmtk_process_coredump(struct hci_dev *hdev, struct sk_buff *skb);
202202
void btmtk_fw_get_filename(char *buf, size_t size, u32 dev_id, u32 fw_ver,
203203
u32 fw_flavor);
204204

205-
#if IS_ENABLED(CONFIG_BT_HCIBTUSB_MTK)
206205
int btmtk_usb_subsys_reset(struct hci_dev *hdev, u32 dev_id);
207206

208207
int btmtk_usb_recv_acl(struct hci_dev *hdev, struct sk_buff *skb);
@@ -217,7 +216,6 @@ int btmtk_usb_suspend(struct hci_dev *hdev);
217216
int btmtk_usb_setup(struct hci_dev *hdev);
218217

219218
int btmtk_usb_shutdown(struct hci_dev *hdev);
220-
#endif
221219
#else
222220

223221
static inline int btmtk_set_bdaddr(struct hci_dev *hdev,

0 commit comments

Comments
 (0)