Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 941521e2 authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

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: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent c2bfb100

drivers/bluetooth/btbcm.c

+4 −0
Original line number Diff line number Diff line
@@ -327,6 +327,8 @@ int btbcm_setup_patchram(struct hci_dev *hdev) 


	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
Original line number Diff line number Diff line
@@ -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) {