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 <[email protected]>
Acked-by: Marcel Holtmann <[email protected]>
Signed-off-by: Gustavo Padovan <[email protected]>

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 3f124f43fcb179ef7f454a57ec634581ef659261..3a9cbf2b55c0dfa5ff37a3b8208fecfc2c11d0a8 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -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;

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 6218eced15304331d8db9125535cabaa814bb2c2..3fc699db8fb5a7c75350212197bb7f8659c24c1e 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -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.
         */