Bluetooth: btusb: Move Broadcom quirk setting into support module

PATCH In review Marcel Holtmann 1 participant 1 message Apr 6, 2015 Bluetooth drivers

Share & tools

Marcel Holtmann

author maintainer

2015-04-06 05:52 UTC #0 lore raw

PATCH v2 6/10 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 <[email protected]>

---
 drivers/bluetooth/btbcm.c | 4 ++++
 drivers/bluetooth/btusb.c | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

drivers/bluetooth/btbcm.c +4 -0

index 17565ab610f4..c90401261ab4 100644
@@ -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);

drivers/bluetooth/btusb.c +1 -4

index 53275c55c782..ea7c726adcb1 100644
@@ -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) {

Signature · 1 line

2.1.0