提交 86a75645 编写于 作者: M Marcel Holtmann 提交者: Johan Hedberg

Bluetooth: Make mgmt_discoverable() return void

The return value of mgmt_discoverable() function is not used
and so just change it to return void.
Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
上级 6acd7db4
......@@ -1100,7 +1100,7 @@ void mgmt_index_added(struct hci_dev *hdev);
void mgmt_index_removed(struct hci_dev *hdev);
void mgmt_set_powered_failed(struct hci_dev *hdev, int err);
int mgmt_powered(struct hci_dev *hdev, u8 powered);
int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable);
void mgmt_discoverable(struct hci_dev *hdev, u8 discoverable);
int mgmt_connectable(struct hci_dev *hdev, u8 connectable);
int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status);
int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,
......
......@@ -4227,30 +4227,24 @@ void mgmt_set_powered_failed(struct hci_dev *hdev, int err)
mgmt_pending_remove(cmd);
}
int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable)
void mgmt_discoverable(struct hci_dev *hdev, u8 discoverable)
{
bool changed = false;
int err = 0;
bool changed;
/* Nothing needed here if there's a pending command since that
* commands request completion callback takes care of everything
* necessary.
*/
if (mgmt_pending_find(MGMT_OP_SET_DISCOVERABLE, hdev))
return 0;
return;
if (discoverable) {
if (!test_and_set_bit(HCI_DISCOVERABLE, &hdev->dev_flags))
changed = true;
} else {
if (test_and_clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags))
changed = true;
}
if (discoverable)
changed = !test_and_set_bit(HCI_DISCOVERABLE, &hdev->dev_flags);
else
changed = test_and_clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags);
if (changed)
err = new_settings(hdev, NULL);
return err;
new_settings(hdev, NULL);
}
int mgmt_connectable(struct hci_dev *hdev, u8 connectable)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册