From: Johan Hedberg <johan.hedberg@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v2 10/11] Bluetooth: Remove unused hdev->init_last_cmd
Date: Tue, 5 Mar 2013 10:29:09 +0200 [thread overview]
Message-ID: <1362472150-30965-11-git-send-email-johan.hedberg@gmail.com> (raw)
In-Reply-To: <1362472150-30965-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
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>
---
include/net/bluetooth/hci_core.h | 2 --
net/bluetooth/hci_core.c | 6 ------
2 files changed, 8 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 7a6bb1e..ca5467c 100644
--- 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 cf0b7d1..6e4de58 100644
--- 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);
}
@@ -2516,9 +2513,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;
-
hci_req_from_skb(hdev, skb);
return 0;
--
1.7.10.4
next prev parent reply other threads:[~2013-03-05 8:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-05 8:28 [PATCH v2 00/11] Bluetooth: Add asynchronous request support Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 01/11] Bluetooth: Rename hci_request to hci_req_sync Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 02/11] Bluetooth: Fix __hci_request() handling of empty requests Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 03/11] Bluetooth: Split HCI init sequence into three stages Johan Hedberg
2013-03-05 17:01 ` Marcel Holtmann
2013-03-05 8:29 ` [PATCH v2 04/11] Bluetooth: Add initial skeleton for asynchronous HCI requests Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 05/11] Bluetooth: Refactor HCI command skb creation Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 06/11] Bluetooth: Introduce new hci_req_add function Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 07/11] Bluetooth: Introduce a hci_req_from_skb function Johan Hedberg
2013-03-05 17:04 ` Marcel Holtmann
2013-03-05 8:29 ` [PATCH v2 08/11] Bluetooth: Add request cmd_complete and cmd_status functions Johan Hedberg
2013-03-05 8:29 ` [PATCH v2 09/11] Bluetooth: Use async requests internally in hci_req_sync Johan Hedberg
2013-03-05 17:08 ` Marcel Holtmann
2013-03-05 8:29 ` Johan Hedberg [this message]
2013-03-05 8:29 ` [PATCH v2 11/11] Bluetooth: Remove empty HCI event handlers Johan Hedberg
2013-03-05 17:10 ` Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362472150-30965-11-git-send-email-johan.hedberg@gmail.com \
--to=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox