microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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>
This commit is contained in:
Johan Hedberg 2015-11-10 09:44:55 +02:00 коммит произвёл Marcel Holtmann
Родитель be91cd0570
Коммит b504430c86
3 изменённых файлов: 20 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

28
net/bluetooth/hci_core.c
Просмотреть файл

@ -92,14 +92,14 @@ static ssize_t dut_mode_write(struct file *file, const char __user *user_buf,
if (enable == hci_dev_test_flag(hdev, HCI_DUT_MODE)) if (enable == hci_dev_test_flag(hdev, HCI_DUT_MODE))
return -EALREADY; return -EALREADY;
hci_req_lock(hdev); hci_req_sync_lock(hdev);
if (enable) if (enable)
skb = __hci_cmd_sync(hdev, HCI_OP_ENABLE_DUT_MODE, 0, NULL, skb = __hci_cmd_sync(hdev, HCI_OP_ENABLE_DUT_MODE, 0, NULL,
HCI_CMD_TIMEOUT); HCI_CMD_TIMEOUT);
else else
skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL,
HCI_CMD_TIMEOUT); HCI_CMD_TIMEOUT);
hci_req_unlock(hdev); hci_req_sync_unlock(hdev);
if (IS_ERR(skb)) if (IS_ERR(skb))
return PTR_ERR(skb); return PTR_ERR(skb);
@ -156,9 +156,9 @@ static ssize_t vendor_diag_write(struct file *file, const char __user *user_buf,
!test_bit(HCI_RUNNING, &hdev->flags)) !test_bit(HCI_RUNNING, &hdev->flags))
goto done; goto done;
hci_req_lock(hdev); hci_req_sync_lock(hdev);
err = hdev->set_diag(hdev, enable); err = hdev->set_diag(hdev, enable);
hci_req_unlock(hdev); hci_req_sync_unlock(hdev);
if (err < 0) if (err < 0)
return err; return err;
@ -1257,7 +1257,7 @@ static int hci_dev_do_open(struct hci_dev *hdev)
BT_DBG("%s %p", hdev->name, hdev); BT_DBG("%s %p", hdev->name, hdev);
hci_req_lock(hdev); hci_req_sync_lock(hdev);
if (hci_dev_test_flag(hdev, HCI_UNREGISTER)) { if (hci_dev_test_flag(hdev, HCI_UNREGISTER)) {
ret = -ENODEV; ret = -ENODEV;
@ -1410,7 +1410,7 @@ static int hci_dev_do_open(struct hci_dev *hdev)
} }
done: done:
hci_req_unlock(hdev); hci_req_sync_unlock(hdev);
return ret; return ret;
} }
@ -1504,12 +1504,12 @@ int hci_dev_do_close(struct hci_dev *hdev)
cancel_delayed_work(&hdev->power_off); cancel_delayed_work(&hdev->power_off);
hci_req_cancel(hdev, ENODEV); hci_req_sync_cancel(hdev, ENODEV);
hci_req_lock(hdev); hci_req_sync_lock(hdev);
if (!test_and_clear_bit(HCI_UP, &hdev->flags)) { if (!test_and_clear_bit(HCI_UP, &hdev->flags)) {
cancel_delayed_work_sync(&hdev->cmd_timer); cancel_delayed_work_sync(&hdev->cmd_timer);
hci_req_unlock(hdev); hci_req_sync_unlock(hdev);
return 0; return 0;
} }
@ -1607,7 +1607,7 @@ int hci_dev_do_close(struct hci_dev *hdev)
memset(hdev->dev_class, 0, sizeof(hdev->dev_class)); memset(hdev->dev_class, 0, sizeof(hdev->dev_class));
bacpy(&hdev->random_addr, BDADDR_ANY); bacpy(&hdev->random_addr, BDADDR_ANY);
hci_req_unlock(hdev); hci_req_sync_unlock(hdev);
hci_dev_put(hdev); hci_dev_put(hdev);
return 0; return 0;
@ -1643,7 +1643,7 @@ static int hci_dev_do_reset(struct hci_dev *hdev)
BT_DBG("%s %p", hdev->name, hdev); BT_DBG("%s %p", hdev->name, hdev);
hci_req_lock(hdev); hci_req_sync_lock(hdev);
/* Drop queues */ /* Drop queues */
skb_queue_purge(&hdev->rx_q); skb_queue_purge(&hdev->rx_q);
@ -1667,7 +1667,7 @@ static int hci_dev_do_reset(struct hci_dev *hdev)
ret = __hci_req_sync(hdev, hci_reset_req, 0, HCI_INIT_TIMEOUT); ret = __hci_req_sync(hdev, hci_reset_req, 0, HCI_INIT_TIMEOUT);
hci_req_unlock(hdev); hci_req_sync_unlock(hdev);
return ret; return ret;
} }
@ -3537,9 +3537,9 @@ struct sk_buff *hci_cmd_sync(struct hci_dev *hdev, u16 opcode, u32 plen,
bt_dev_dbg(hdev, "opcode 0x%4.4x plen %d", opcode, plen); bt_dev_dbg(hdev, "opcode 0x%4.4x plen %d", opcode, plen);
hci_req_lock(hdev); hci_req_sync_lock(hdev);
skb = __hci_cmd_sync(hdev, opcode, plen, param, timeout); skb = __hci_cmd_sync(hdev, opcode, plen, param, timeout);
hci_req_unlock(hdev); hci_req_sync_unlock(hdev);
return skb; return skb;
} }

6
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); 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; return -ENETDOWN;
/* Serialize all requests */ /* Serialize all requests */
hci_req_lock(hdev); hci_req_sync_lock(hdev);
ret = __hci_req_sync(hdev, req, opt, timeout); ret = __hci_req_sync(hdev, req, opt, timeout);
hci_req_unlock(hdev); hci_req_sync_unlock(hdev);
return ret; return ret;
} }

6
net/bluetooth/hci_request.h
Просмотреть файл

@ -20,8 +20,8 @@
SOFTWARE IS DISCLAIMED. SOFTWARE IS DISCLAIMED.
*/ */
#define hci_req_lock(d) mutex_lock(&d->req_lock) #define hci_req_sync_lock(hdev) mutex_lock(&hdev->req_lock)
#define hci_req_unlock(d) mutex_unlock(&d->req_lock) #define hci_req_sync_unlock(hdev) mutex_unlock(&hdev->req_lock)
struct hci_request { struct hci_request {
struct hci_dev *hdev; struct hci_dev *hdev;
@ -50,7 +50,7 @@ int hci_req_sync(struct hci_dev *hdev, void (*req)(struct hci_request *req,
int __hci_req_sync(struct hci_dev *hdev, void (*func)(struct hci_request *req, int __hci_req_sync(struct hci_dev *hdev, void (*func)(struct hci_request *req,
unsigned long opt), unsigned long opt),
unsigned long opt, __u32 timeout); unsigned long opt, __u32 timeout);
void hci_req_cancel(struct hci_dev *hdev, int err); void hci_req_sync_cancel(struct hci_dev *hdev, int err);
struct sk_buff *hci_prepare_cmd(struct hci_dev *hdev, u16 opcode, u32 plen, struct sk_buff *hci_prepare_cmd(struct hci_dev *hdev, u16 opcode, u32 plen,
const void *param); const void *param);