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

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

Bluetooth: btusb: Remove unneeded btusb_read_local_version function 



The btusb_read_local_version function has only a single user and with
that just move its functionality in place where it belongs.

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

drivers/bluetooth/btusb.c

+13 −25
Original line number Diff line number Diff line
@@ -1302,28 +1302,6 @@ 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;
@@ -1347,9 +1325,19 @@ static int btusb_setup_csr(struct hci_dev *hdev) 


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



	skb = btusb_read_local_version(hdev);

	if (IS_ERR(skb))

		return -PTR_ERR(skb);

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

			     HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		int err = PTR_ERR(skb);

		BT_ERR("%s: CSR: Local version failed (%d)", hdev->name, err);

		return err;

	}



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

		BT_ERR("%s: CSR: Local version length mismatch", hdev->name);

		kfree_skb(skb);

		return -EIO;

	}



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