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

Commit d4299ce6 authored by Andre Guedes's avatar Andre Guedes Committed by Johan Hedberg
Browse files

Bluetooth: Remove unneeded hci_req_cmd_status function 



This patch removes the hci_req_cmd_status function since it is not
used anymore. The HCI request framework now considers the HCI command
has complete once the Command Status or Command Complete Event is
received.

Signed-off-by: default avatarAndre Guedes <andre.guedes@openbossa.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 3e13fa1e

include/net/bluetooth/hci_core.h

+0 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,6 @@ void hci_req_init(struct hci_request *req, struct hci_dev *hdev); 
int hci_req_run(struct hci_request *req, hci_req_complete_t complete);

void hci_req_add(struct hci_request *req, u16 opcode, u32 plen, void *param);

void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status);

void hci_req_cmd_status(struct hci_dev *hdev, u16 opcode, u8 status);



int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param);

void hci_send_acl(struct hci_chan *chan, struct sk_buff *skb, __u16 flags);

net/bluetooth/hci_core.c

+0 −26
Original line number Diff line number Diff line
@@ -3322,32 +3322,6 @@ void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status) 
		req_complete(hdev, status);

}



void hci_req_cmd_status(struct hci_dev *hdev, u16 opcode, u8 status)

{

	hci_req_complete_t req_complete = NULL;



	BT_DBG("opcode 0x%04x status 0x%02x", opcode, status);



	if (status) {

		hci_req_cmd_complete(hdev, opcode, status);

		return;

	}



	/* No need to handle success status if there are more commands */

	if (!hci_req_is_complete(hdev))

		return;



	if (hdev->sent_cmd)

		req_complete = bt_cb(hdev->sent_cmd)->req.complete;



	/* If the request doesn't have a complete callback or there

	 * are other commands/requests in the hdev queue we consider

	 * this request as completed.

	 */

	if (!req_complete || !skb_queue_empty(&hdev->cmd_q))

		hci_req_cmd_complete(hdev, opcode, status);

}



static void hci_rx_work(struct work_struct *work)

{

	struct hci_dev *hdev = container_of(work, struct hci_dev, rx_work);