diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2013-10-15 17:26:20 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-10-15 19:52:47 -0400 |
commit | ce0e4a0d7b84d4ceebc91f97de8c08da23a7bda3 (patch) | |
tree | 97f045af30760f7dea5024213fe429054d6b128d | |
parent | 2ce5fb510fc0ba50c8e1b6bcb991848084ea67ec (diff) |
Bluetooth: Make mgmt_pin_code_request() return void
The return value of mgmt_pin_code_request() 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>
-rw-r--r-- | include/net/bluetooth/hci_core.h | 2 | ||||
-rw-r--r-- | net/bluetooth/mgmt.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index fc04bc846617..a167a9dda7c7 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -1087,7 +1087,7 @@ void mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, | |||
1087 | u8 link_type, u8 addr_type, u8 status); | 1087 | u8 link_type, u8 addr_type, u8 status); |
1088 | void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | 1088 | void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, |
1089 | u8 addr_type, u8 status); | 1089 | u8 addr_type, u8 status); |
1090 | int mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure); | 1090 | void mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure); |
1091 | int mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | 1091 | int mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, |
1092 | u8 status); | 1092 | u8 status); |
1093 | int mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | 1093 | int mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, |
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index ca3cdb520b2f..efa2c524fcf8 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -4533,7 +4533,7 @@ void mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | |||
4533 | mgmt_event(MGMT_EV_CONNECT_FAILED, hdev, &ev, sizeof(ev), NULL); | 4533 | mgmt_event(MGMT_EV_CONNECT_FAILED, hdev, &ev, sizeof(ev), NULL); |
4534 | } | 4534 | } |
4535 | 4535 | ||
4536 | int mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure) | 4536 | void mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure) |
4537 | { | 4537 | { |
4538 | struct mgmt_ev_pin_code_request ev; | 4538 | struct mgmt_ev_pin_code_request ev; |
4539 | 4539 | ||
@@ -4541,8 +4541,7 @@ int mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure) | |||
4541 | ev.addr.type = BDADDR_BREDR; | 4541 | ev.addr.type = BDADDR_BREDR; |
4542 | ev.secure = secure; | 4542 | ev.secure = secure; |
4543 | 4543 | ||
4544 | return mgmt_event(MGMT_EV_PIN_CODE_REQUEST, hdev, &ev, sizeof(ev), | 4544 | mgmt_event(MGMT_EV_PIN_CODE_REQUEST, hdev, &ev, sizeof(ev), NULL); |
4545 | NULL); | ||
4546 | } | 4545 | } |
4547 | 4546 | ||
4548 | int mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, | 4547 | int mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, |