summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_request.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2015-11-10 08:44:55 +0100
committerMarcel Holtmann <marcel@holtmann.org>2015-11-19 17:50:28 +0100
commitb504430c868c2979d2dbee9be051e425fdeb36ac (patch)
tree266682dfcf7c5f9afc0a61232effd5cce81debe2 /net/bluetooth/hci_request.c
parentBluetooth: Move synchronous request handling into hci_request.c (diff)
downloadlinux-b504430c868c2979d2dbee9be051e425fdeb36ac.tar.xz
linux-b504430c868c2979d2dbee9be051e425fdeb36ac.zip
Bluetooth: Add 'sync' specifier to synchronous request APIs
To make it clear which HCI request APIs target specifically synchronous requests, add 'sync' to the API names. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_request.c')
-rw-r--r--net/bluetooth/hci_request.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index aa868f6f5a90..ae19bce89616 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -100,7 +100,7 @@ static void hci_req_sync_complete(struct hci_dev *hdev, u8 result, u16 opcode,
}
}
-void hci_req_cancel(struct hci_dev *hdev, int err)
+void hci_req_sync_cancel(struct hci_dev *hdev, int err)
{
BT_DBG("%s err 0x%2.2x", hdev->name, err);
@@ -259,9 +259,9 @@ int hci_req_sync(struct hci_dev *hdev, void (*req)(struct hci_request *req,
return -ENETDOWN;
/* Serialize all requests */
- hci_req_lock(hdev);
+ hci_req_sync_lock(hdev);
ret = __hci_req_sync(hdev, req, opt, timeout);
- hci_req_unlock(hdev);
+ hci_req_sync_unlock(hdev);
return ret;
}