Skip to content

Commit

Permalink
Bluetooth: Remove unused hdev->init_last_cmd
Browse files Browse the repository at this point in the history
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: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
  • Loading branch information
Johan Hedberg authored and Gustavo Padovan committed Mar 8, 2013
1 parent 42c6b12 commit cecbb96
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
2 changes: 0 additions & 2 deletions include/net/bluetooth/hci_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions net/bluetooth/hci_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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.
*/
Expand Down

0 comments on commit cecbb96

Please sign in to comment.