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

Commit cecbb967 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Remove unused hdev->init_last_cmd 



This variable is no longer needed (due to async HCI request support and
the conversion of hci_req_sync to use it), so it can be safely removed.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 42c6b129

include/net/bluetooth/hci_core.h

+0 −2
Original line number Diff line number Diff line
@@ -248,8 +248,6 @@ struct hci_dev { 
	__u32			req_status;

	__u32			req_result;



	__u16			init_last_cmd;



	struct list_head	mgmt_pending;



	struct discovery_state	discovery;

net/bluetooth/hci_core.c

+0 −6
Original line number Diff line number Diff line
@@ -1015,10 +1015,7 @@ int hci_dev_open(__u16 dev) 
	if (!test_bit(HCI_RAW, &hdev->flags)) {

		atomic_set(&hdev->cmd_cnt, 1);

		set_bit(HCI_INIT, &hdev->flags);

		hdev->init_last_cmd = 0;



		ret = __hci_init(hdev);



		clear_bit(HCI_INIT, &hdev->flags);

	}
@@ -2509,9 +2506,6 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param) 
		return -ENOMEM;

	}



	if (test_bit(HCI_INIT, &hdev->flags))

		hdev->init_last_cmd = opcode;



	/* Stand-alone HCI commands must be flaged as

	 * single-command requests.

	 */