diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2013-03-05 13:37:50 -0500 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-03-08 08:40:27 -0500 |
commit | cecbb967b2f5c52e090978ff6afe7deddbfbeda5 (patch) | |
tree | 7e43e45b1b6cd8d94d708c3f3fdd764dbaea1236 | |
parent | 42c6b129cd8c2aa5012a78ec39672e7052cc677a (diff) |
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: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-rw-r--r-- | include/net/bluetooth/hci_core.h | 2 | ||||
-rw-r--r-- | net/bluetooth/hci_core.c | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 3f124f43fcb1..3a9cbf2b55c0 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -248,8 +248,6 @@ struct hci_dev { | |||
248 | __u32 req_status; | 248 | __u32 req_status; |
249 | __u32 req_result; | 249 | __u32 req_result; |
250 | 250 | ||
251 | __u16 init_last_cmd; | ||
252 | |||
253 | struct list_head mgmt_pending; | 251 | struct list_head mgmt_pending; |
254 | 252 | ||
255 | struct discovery_state discovery; | 253 | struct discovery_state discovery; |
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 6218eced1530..3fc699db8fb5 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -1015,10 +1015,7 @@ int hci_dev_open(__u16 dev) | |||
1015 | if (!test_bit(HCI_RAW, &hdev->flags)) { | 1015 | if (!test_bit(HCI_RAW, &hdev->flags)) { |
1016 | atomic_set(&hdev->cmd_cnt, 1); | 1016 | atomic_set(&hdev->cmd_cnt, 1); |
1017 | set_bit(HCI_INIT, &hdev->flags); | 1017 | set_bit(HCI_INIT, &hdev->flags); |
1018 | hdev->init_last_cmd = 0; | ||
1019 | |||
1020 | ret = __hci_init(hdev); | 1018 | ret = __hci_init(hdev); |
1021 | |||
1022 | clear_bit(HCI_INIT, &hdev->flags); | 1019 | clear_bit(HCI_INIT, &hdev->flags); |
1023 | } | 1020 | } |
1024 | 1021 | ||
@@ -2509,9 +2506,6 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param) | |||
2509 | return -ENOMEM; | 2506 | return -ENOMEM; |
2510 | } | 2507 | } |
2511 | 2508 | ||
2512 | if (test_bit(HCI_INIT, &hdev->flags)) | ||
2513 | hdev->init_last_cmd = opcode; | ||
2514 | |||
2515 | /* Stand-alone HCI commands must be flaged as | 2509 | /* Stand-alone HCI commands must be flaged as |
2516 | * single-command requests. | 2510 | * single-command requests. |
2517 | */ | 2511 | */ |