Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 14:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: Make mgmt_discoverable() return void

Browse Source 
The return value of mgmt_discoverable() function is not used
and so just change it to return void.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2013-10-15 06:33:54 -07:00 committed by Johan Hedberg
parent 6acd7db41d
commit 86a7564573
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/bluetooth/hci_core.h
View File

@ -1100,7 +1100,7 @@ void mgmt_index_added(struct hci_dev *hdev);
void mgmt_index_removed(struct hci_dev *hdev); void mgmt_index_removed(struct hci_dev *hdev);
void mgmt_set_powered_failed(struct hci_dev *hdev, int err); void mgmt_set_powered_failed(struct hci_dev *hdev, int err);
int mgmt_powered(struct hci_dev *hdev, u8 powered); 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_connectable(struct hci_dev *hdev, u8 connectable);
int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status); 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, int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,

22
net/bluetooth/mgmt.c
View File

@ -4227,30 +4227,24 @@ void mgmt_set_powered_failed(struct hci_dev *hdev, int err)
mgmt_pending_remove(cmd); 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; bool changed;
int err = 0;
/* Nothing needed here if there's a pending command since that /* Nothing needed here if there's a pending command since that
* commands request completion callback takes care of everything * commands request completion callback takes care of everything
* necessary. * necessary.
*/ */
if (mgmt_pending_find(MGMT_OP_SET_DISCOVERABLE, hdev)) if (mgmt_pending_find(MGMT_OP_SET_DISCOVERABLE, hdev))
return 0; return;
if (discoverable) { if (discoverable)
if (!test_and_set_bit(HCI_DISCOVERABLE, &hdev->dev_flags)) changed = !test_and_set_bit(HCI_DISCOVERABLE, &hdev->dev_flags);
changed = true; else
} else { changed = test_and_clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags);
if (test_and_clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags))
changed = true;
}
if (changed) if (changed)
err = new_settings(hdev, NULL); new_settings(hdev, NULL);
return err;
} }
int mgmt_connectable(struct hci_dev *hdev, u8 connectable) int mgmt_connectable(struct hci_dev *hdev, u8 connectable)