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

Commit 6576fe4a authored by Daniel Drake's avatar Daniel Drake Committed by Johan Hedberg
Browse files

Bluetooth: btusb: Add helper for READ_LOCAL_VERSION command 



Multiple codepaths duplicate some simple code to read and
sanity-check local version information. Before I add a couple more
such codepaths, add a helper to reduce duplication.

Signed-off-by: default avatarDaniel Drake <drake@endlessm.com>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 238be788

drivers/bluetooth/btusb.c

+28 −32
Original line number Diff line number Diff line
@@ -1269,6 +1269,28 @@ static void btusb_waker(struct work_struct *work) 
	usb_autopm_put_interface(data->intf);

}



static struct sk_buff *btusb_read_local_version(struct hci_dev *hdev)

{

	struct sk_buff *skb;



	skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL,

			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION failed (%ld)",

		       hdev->name, PTR_ERR(skb));

		return skb;

	}



	if (skb->len != sizeof(struct hci_rp_read_local_version)) {

		BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION event length mismatch",

		       hdev->name);

		kfree_skb(skb);

		return ERR_PTR(-EIO);

	}



	return skb;

}



static int btusb_setup_bcm92035(struct hci_dev *hdev)

{

	struct sk_buff *skb;
@@ -1293,12 +1315,9 @@ static int btusb_setup_csr(struct hci_dev *hdev) 


	BT_DBG("%s", hdev->name);



	skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL,

			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		BT_ERR("Reading local version failed (%ld)", -PTR_ERR(skb));

	skb = btusb_read_local_version(hdev);

	if (IS_ERR(skb))

		return -PTR_ERR(skb);

	}



	rp = (struct hci_rp_read_local_version *)skb->data;
@@ -2429,21 +2448,9 @@ static int btusb_setup_bcm_patchram(struct hci_dev *hdev) 
	kfree_skb(skb);



	/* Read Local Version Info */

	skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL,

			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		ret = PTR_ERR(skb);

		BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION failed (%ld)",

		       hdev->name, ret);

		return ret;

	}



	if (skb->len != sizeof(*ver)) {

		BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION event length mismatch",

		       hdev->name);

		kfree_skb(skb);

		return -EIO;

	}

	skb = btusb_read_local_version(hdev);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	ver = (struct hci_rp_read_local_version *)skb->data;

	rev = le16_to_cpu(ver->hci_rev);
@@ -2531,20 +2538,9 @@ static int btusb_setup_bcm_patchram(struct hci_dev *hdev) 
	kfree_skb(skb);



	/* Read Local Version Info */

	skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL,

			     HCI_INIT_TIMEOUT);

	skb = btusb_read_local_version(hdev);

	if (IS_ERR(skb)) {

		ret = PTR_ERR(skb);

		BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION failed (%ld)",

		       hdev->name, ret);

		goto done;

	}



	if (skb->len != sizeof(*ver)) {

		BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION event length mismatch",

		       hdev->name);

		kfree_skb(skb);

		ret = -EIO;

		goto done;

	}