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 <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index 17565ab..c904012 100644 (file)
--- 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 53275c5..ea7c726 100644 (file)
--- 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) {