Эх сурвалжийг харах

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>
Marcel Holtmann 10 жил өмнө
parent
commit
941521e24f

+ 4 - 0
drivers/bluetooth/btbcm.c

@@ -327,6 +327,8 @@ reset:
 
 
 	btbcm_check_bdaddr(hdev);
 	btbcm_check_bdaddr(hdev);
 
 
+	set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
+
 done:
 done:
 	release_firmware(fw);
 	release_firmware(fw);
 
 
@@ -347,6 +349,8 @@ int btbcm_setup_apple(struct hci_dev *hdev)
 		get_unaligned_le16(skb->data + 5));
 		get_unaligned_le16(skb->data + 5));
 	kfree_skb(skb);
 	kfree_skb(skb);
 
 
+	set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
+
 	return 0;
 	return 0;
 }
 }
 EXPORT_SYMBOL_GPL(btbcm_setup_apple);
 EXPORT_SYMBOL_GPL(btbcm_setup_apple);

+ 1 - 4
drivers/bluetooth/btusb.c

@@ -2799,13 +2799,10 @@ static int btusb_probe(struct usb_interface *intf,
 	if (id->driver_info & BTUSB_BCM_PATCHRAM) {
 	if (id->driver_info & BTUSB_BCM_PATCHRAM) {
 		hdev->setup = btbcm_setup_patchram;
 		hdev->setup = btbcm_setup_patchram;
 		hdev->set_bdaddr = btbcm_set_bdaddr;
 		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;
 		hdev->setup = btbcm_setup_apple;
-		set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
-	}
 #endif
 #endif
 
 
 	if (id->driver_info & BTUSB_INTEL) {
 	if (id->driver_info & BTUSB_INTEL) {