aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-10-15 17:26:27 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-10-15 19:54:34 -0400
commit7667da3423cdf06a818e73adaf2f675455cc8e99 (patch)
tree9db2d4871bf02f1433bfa3773aabbe092b89ac46 /net
parent4e1b0245f2394a6ee4a79bb183f56f8fe2c7af33 (diff)
Bluetooth: Make mgmt_set_local_name_complete() return void
The return value of mgmt_set_local_name_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.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 24da84ecd062..b4b5cb7786df 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4813,13 +4813,13 @@ void mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,
4813 sock_put(match.sk); 4813 sock_put(match.sk);
4814} 4814}
4815 4815
4816int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status) 4816void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status)
4817{ 4817{
4818 struct mgmt_cp_set_local_name ev; 4818 struct mgmt_cp_set_local_name ev;
4819 struct pending_cmd *cmd; 4819 struct pending_cmd *cmd;
4820 4820
4821 if (status) 4821 if (status)
4822 return 0; 4822 return;
4823 4823
4824 memset(&ev, 0, sizeof(ev)); 4824 memset(&ev, 0, sizeof(ev));
4825 memcpy(ev.name, name, HCI_MAX_NAME_LENGTH); 4825 memcpy(ev.name, name, HCI_MAX_NAME_LENGTH);
@@ -4833,11 +4833,11 @@ int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status)
4833 * HCI dev don't send any mgmt signals. 4833 * HCI dev don't send any mgmt signals.
4834 */ 4834 */
4835 if (mgmt_pending_find(MGMT_OP_SET_POWERED, hdev)) 4835 if (mgmt_pending_find(MGMT_OP_SET_POWERED, hdev))
4836 return 0; 4836 return;
4837 } 4837 }
4838 4838
4839 return mgmt_event(MGMT_EV_LOCAL_NAME_CHANGED, hdev, &ev, sizeof(ev), 4839 mgmt_event(MGMT_EV_LOCAL_NAME_CHANGED, hdev, &ev, sizeof(ev),
4840 cmd ? cmd->sk : NULL); 4840 cmd ? cmd->sk : NULL);
4841} 4841}
4842 4842
4843int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash, 4843int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,