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

Commit e76dc1dd authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: btbcm: Consolidate the controller information commands 



The commands that read the basic vendor information about the Broadcom
controller are duplicated for UART and USB devices. Combine them into a
single function to reduce the code complexity.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 74183a1c

drivers/bluetooth/btbcm.c

+39 −30
Original line number Diff line number Diff line
@@ -287,6 +287,37 @@ static struct sk_buff *btbcm_read_usb_product(struct hci_dev *hdev) 
	return skb;

}



static int btbcm_read_info(struct hci_dev *hdev)

{

	struct sk_buff *skb;



	/* Read Verbose Config Version Info */

	skb = btbcm_read_verbose_config(hdev);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	BT_INFO("%s: BCM: chip id %u", hdev->name, skb->data[1]);

	kfree_skb(skb);



	/* Read Controller Features */

	skb = btbcm_read_controller_features(hdev);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	BT_INFO("%s: BCM: features 0x%2.2x", hdev->name, skb->data[1]);

	kfree_skb(skb);



	/* Read Local Name */

	skb = btbcm_read_local_name(hdev);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	BT_INFO("%s: %s", hdev->name, (char *)(skb->data + 1));

	kfree_skb(skb);



	return 0;

}



static const struct {

	u16 subver;

	const char *name;
@@ -322,13 +353,10 @@ int btbcm_initialize(struct hci_dev *hdev, char *fw_name, size_t len) 
	subver = le16_to_cpu(ver->lmp_subver);

	kfree_skb(skb);



	/* Read Verbose Config Version Info */

	skb = btbcm_read_verbose_config(hdev);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	BT_INFO("%s: BCM: chip id %u", hdev->name, skb->data[1]);

	kfree_skb(skb);

	/* Read controller information */

	err = btbcm_read_info(hdev);

	if (err)

		return err;



	switch ((rev & 0xf000) >> 12) {

	case 0:
@@ -431,29 +459,10 @@ int btbcm_setup_patchram(struct hci_dev *hdev) 
	subver = le16_to_cpu(ver->lmp_subver);

	kfree_skb(skb);



	/* Read Verbose Config Version Info */

	skb = btbcm_read_verbose_config(hdev);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	BT_INFO("%s: BCM: chip id %u", hdev->name, skb->data[1]);

	kfree_skb(skb);



	/* Read Controller Features */

	skb = btbcm_read_controller_features(hdev);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	BT_INFO("%s: BCM: features 0x%2.2x", hdev->name, skb->data[1]);

	kfree_skb(skb);



	/* Read Local Name */

	skb = btbcm_read_local_name(hdev);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	BT_INFO("%s: %s", hdev->name, (char *)(skb->data + 1));

	kfree_skb(skb);

	/* Read controller information */

	err = btbcm_read_info(hdev);

	if (err)

		return err;



	switch ((rev & 0xf000) >> 12) {

	case 0: