aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-10-15 17:26:25 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-10-15 19:54:23 -0400
commit3e248560d951b4a99aaa1d1332030853e2ebc3fd (patch)
tree7cba1ea7415bf5042b2a4a4278fabd2741c702bf /net
parent464996aea48aa1ec3d7d60098dbb0f7623da6c92 (diff)
Bluetooth: Make mgmt_ssp_enable_complete() return void
The return value of mgmt_ssp_enable_complete() function is not used and so just change it to return void. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/mgmt.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 0672a8cb662e..969dbaaf243a 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4737,12 +4737,11 @@ static void clear_eir(struct hci_request *req)
4737 hci_req_add(req, HCI_OP_WRITE_EIR, sizeof(cp), &cp); 4737 hci_req_add(req, HCI_OP_WRITE_EIR, sizeof(cp), &cp);
4738} 4738}
4739 4739
4740int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status) 4740void mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status)
4741{ 4741{
4742 struct cmd_lookup match = { NULL, hdev }; 4742 struct cmd_lookup match = { NULL, hdev };
4743 struct hci_request req; 4743 struct hci_request req;
4744 bool changed = false; 4744 bool changed = false;
4745 int err = 0;
4746 4745
4747 if (status) { 4746 if (status) {
4748 u8 mgmt_err = mgmt_status(status); 4747 u8 mgmt_err = mgmt_status(status);
@@ -4750,13 +4749,12 @@ int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status)
4750 if (enable && test_and_clear_bit(HCI_SSP_ENABLED, 4749 if (enable && test_and_clear_bit(HCI_SSP_ENABLED,
4751 &hdev->dev_flags)) { 4750 &hdev->dev_flags)) {
4752 clear_bit(HCI_HS_ENABLED, &hdev->dev_flags); 4751 clear_bit(HCI_HS_ENABLED, &hdev->dev_flags);
4753 err = new_settings(hdev, NULL); 4752 new_settings(hdev, NULL);
4754 } 4753 }
4755 4754
4756 mgmt_pending_foreach(MGMT_OP_SET_SSP, hdev, cmd_status_rsp, 4755 mgmt_pending_foreach(MGMT_OP_SET_SSP, hdev, cmd_status_rsp,
4757 &mgmt_err); 4756 &mgmt_err);
4758 4757 return;
4759 return err;
4760 } 4758 }
4761 4759
4762 if (enable) { 4760 if (enable) {
@@ -4773,7 +4771,7 @@ int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status)
4773 mgmt_pending_foreach(MGMT_OP_SET_SSP, hdev, settings_rsp, &match); 4771 mgmt_pending_foreach(MGMT_OP_SET_SSP, hdev, settings_rsp, &match);
4774 4772
4775 if (changed) 4773 if (changed)
4776 err = new_settings(hdev, match.sk); 4774 new_settings(hdev, match.sk);
4777 4775
4778 if (match.sk) 4776 if (match.sk)
4779 sock_put(match.sk); 4777 sock_put(match.sk);
@@ -4786,8 +4784,6 @@ int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status)
4786 clear_eir(&req); 4784 clear_eir(&req);
4787 4785
4788 hci_req_run(&req, NULL); 4786 hci_req_run(&req, NULL);
4789
4790 return err;
4791} 4787}
4792 4788
4793static void sk_lookup(struct pending_cmd *cmd, void *data) 4789static void sk_lookup(struct pending_cmd *cmd, void *data)