From 941521e24fa8019b94eedecdd0b39942b0060399 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 5 Apr 2015 22:52:15 -0700 Subject: [PATCH] Bluetooth: btusb: Move Broadcom quirk setting into support module The quirks for Broadcom devices can be set from the setup function and to keep the code simple, just move them into Broadcom support module. Signed-off-by: Marcel Holtmann Signed-off-by: Johan Hedberg --- drivers/bluetooth/btbcm.c | 4 ++++ drivers/bluetooth/btusb.c | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c index 17565ab610f4..c90401261ab4 100644 --- a/drivers/bluetooth/btbcm.c +++ b/drivers/bluetooth/btbcm.c @@ -327,6 +327,8 @@ reset: btbcm_check_bdaddr(hdev); + set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks); + done: release_firmware(fw); @@ -347,6 +349,8 @@ int btbcm_setup_apple(struct hci_dev *hdev) get_unaligned_le16(skb->data + 5)); kfree_skb(skb); + set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks); + return 0; } EXPORT_SYMBOL_GPL(btbcm_setup_apple); diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 53275c55c782..ea7c726adcb1 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2799,13 +2799,10 @@ static int btusb_probe(struct usb_interface *intf, if (id->driver_info & BTUSB_BCM_PATCHRAM) { hdev->setup = btbcm_setup_patchram; hdev->set_bdaddr = btbcm_set_bdaddr; - set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks); } - if (id->driver_info & BTUSB_BCM_APPLE) { + if (id->driver_info & BTUSB_BCM_APPLE) hdev->setup = btbcm_setup_apple; - set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks); - } #endif if (id->driver_info & BTUSB_INTEL) { -- 2.20.1