aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2013-03-05 13:37:51 -0500
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-03-08 08:40:27 -0500
commitd865b0070485dfbb0611c5dc07fff21c440858a5 (patch)
treed7785efba6f6375a935d11029a8c33d0a88bfc0d /net/bluetooth/hci_event.c
parentcecbb967b2f5c52e090978ff6afe7deddbfbeda5 (diff)
Bluetooth: Remove empty HCI event handlers
With the removal of hci_req_complete() several HCI event handlers have essentially become empty and can be removed. The only potential benefit of these could have been logging, but the hci_event, hci_cmd_complete and hci_cmd_status already provide a log for events which they do not have an explicit handler for. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c164
1 files changed, 0 insertions, 164 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 0dd85a0c05f4..e89707f3394f 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -424,13 +424,6 @@ static void hci_cc_write_voice_setting(struct hci_dev *hdev,
424 hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING); 424 hdev->notify(hdev, HCI_NOTIFY_VOICE_SETTING);
425} 425}
426 426
427static void hci_cc_host_buffer_size(struct hci_dev *hdev, struct sk_buff *skb)
428{
429 __u8 status = *((__u8 *) skb->data);
430
431 BT_DBG("%s status 0x%2.2x", hdev->name, status);
432}
433
434static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb) 427static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb)
435{ 428{
436 __u8 status = *((__u8 *) skb->data); 429 __u8 status = *((__u8 *) skb->data);
@@ -632,13 +625,6 @@ static void hci_cc_read_data_block_size(struct hci_dev *hdev,
632 hdev->block_cnt, hdev->block_len); 625 hdev->block_cnt, hdev->block_len);
633} 626}
634 627
635static void hci_cc_write_ca_timeout(struct hci_dev *hdev, struct sk_buff *skb)
636{
637 __u8 status = *((__u8 *) skb->data);
638
639 BT_DBG("%s status 0x%2.2x", hdev->name, status);
640}
641
642static void hci_cc_read_local_amp_info(struct hci_dev *hdev, 628static void hci_cc_read_local_amp_info(struct hci_dev *hdev,
643 struct sk_buff *skb) 629 struct sk_buff *skb)
644{ 630{
@@ -701,29 +687,6 @@ a2mp_rsp:
701 a2mp_send_create_phy_link_req(hdev, rp->status); 687 a2mp_send_create_phy_link_req(hdev, rp->status);
702} 688}
703 689
704static void hci_cc_delete_stored_link_key(struct hci_dev *hdev,
705 struct sk_buff *skb)
706{
707 __u8 status = *((__u8 *) skb->data);
708
709 BT_DBG("%s status 0x%2.2x", hdev->name, status);
710}
711
712static void hci_cc_set_event_mask(struct hci_dev *hdev, struct sk_buff *skb)
713{
714 __u8 status = *((__u8 *) skb->data);
715
716 BT_DBG("%s status 0x%2.2x", hdev->name, status);
717}
718
719static void hci_cc_write_inquiry_mode(struct hci_dev *hdev,
720 struct sk_buff *skb)
721{
722 __u8 status = *((__u8 *) skb->data);
723
724 BT_DBG("%s status 0x%2.2x", hdev->name, status);
725}
726
727static void hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev, 690static void hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev,
728 struct sk_buff *skb) 691 struct sk_buff *skb)
729{ 692{
@@ -735,13 +698,6 @@ static void hci_cc_read_inq_rsp_tx_power(struct hci_dev *hdev,
735 hdev->inq_tx_power = rp->tx_power; 698 hdev->inq_tx_power = rp->tx_power;
736} 699}
737 700
738static void hci_cc_set_event_flt(struct hci_dev *hdev, struct sk_buff *skb)
739{
740 __u8 status = *((__u8 *) skb->data);
741
742 BT_DBG("%s status 0x%2.2x", hdev->name, status);
743}
744
745static void hci_cc_pin_code_reply(struct hci_dev *hdev, struct sk_buff *skb) 701static void hci_cc_pin_code_reply(struct hci_dev *hdev, struct sk_buff *skb)
746{ 702{
747 struct hci_rp_pin_code_reply *rp = (void *) skb->data; 703 struct hci_rp_pin_code_reply *rp = (void *) skb->data;
@@ -828,13 +784,6 @@ static void hci_cc_le_read_adv_tx_power(struct hci_dev *hdev,
828 } 784 }
829} 785}
830 786
831static void hci_cc_le_set_event_mask(struct hci_dev *hdev, struct sk_buff *skb)
832{
833 __u8 status = *((__u8 *) skb->data);
834
835 BT_DBG("%s status 0x%2.2x", hdev->name, status);
836}
837
838static void hci_cc_user_confirm_reply(struct hci_dev *hdev, struct sk_buff *skb) 787static void hci_cc_user_confirm_reply(struct hci_dev *hdev, struct sk_buff *skb)
839{ 788{
840 struct hci_rp_user_confirm_reply *rp = (void *) skb->data; 789 struct hci_rp_user_confirm_reply *rp = (void *) skb->data;
@@ -1015,26 +964,6 @@ static void hci_cc_le_read_white_list_size(struct hci_dev *hdev,
1015 hdev->le_white_list_size = rp->size; 964 hdev->le_white_list_size = rp->size;
1016} 965}
1017 966
1018static void hci_cc_le_ltk_reply(struct hci_dev *hdev, struct sk_buff *skb)
1019{
1020 struct hci_rp_le_ltk_reply *rp = (void *) skb->data;
1021
1022 BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
1023
1024 if (rp->status)
1025 return;
1026}
1027
1028static void hci_cc_le_ltk_neg_reply(struct hci_dev *hdev, struct sk_buff *skb)
1029{
1030 struct hci_rp_le_ltk_neg_reply *rp = (void *) skb->data;
1031
1032 BT_DBG("%s status 0x%2.2x", hdev->name, rp->status);
1033
1034 if (rp->status)
1035 return;
1036}
1037
1038static void hci_cc_le_read_supported_states(struct hci_dev *hdev, 967static void hci_cc_le_read_supported_states(struct hci_dev *hdev,
1039 struct sk_buff *skb) 968 struct sk_buff *skb)
1040{ 969{
@@ -1565,11 +1494,6 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status)
1565 } 1494 }
1566} 1495}
1567 1496
1568static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status)
1569{
1570 BT_DBG("%s status 0x%2.2x", hdev->name, status);
1571}
1572
1573static void hci_cs_create_phylink(struct hci_dev *hdev, u8 status) 1497static void hci_cs_create_phylink(struct hci_dev *hdev, u8 status)
1574{ 1498{
1575 struct hci_cp_create_phy_link *cp; 1499 struct hci_cp_create_phy_link *cp;
@@ -1611,11 +1535,6 @@ static void hci_cs_accept_phylink(struct hci_dev *hdev, u8 status)
1611 amp_write_remote_assoc(hdev, cp->phy_handle); 1535 amp_write_remote_assoc(hdev, cp->phy_handle);
1612} 1536}
1613 1537
1614static void hci_cs_create_logical_link(struct hci_dev *hdev, u8 status)
1615{
1616 BT_DBG("%s status 0x%2.2x", hdev->name, status);
1617}
1618
1619static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 1538static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
1620{ 1539{
1621 __u8 status = *((__u8 *) skb->data); 1540 __u8 status = *((__u8 *) skb->data);
@@ -2172,17 +2091,6 @@ unlock:
2172 hci_dev_unlock(hdev); 2091 hci_dev_unlock(hdev);
2173} 2092}
2174 2093
2175static void hci_remote_version_evt(struct hci_dev *hdev, struct sk_buff *skb)
2176{
2177 BT_DBG("%s", hdev->name);
2178}
2179
2180static void hci_qos_setup_complete_evt(struct hci_dev *hdev,
2181 struct sk_buff *skb)
2182{
2183 BT_DBG("%s", hdev->name);
2184}
2185
2186static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 2094static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
2187{ 2095{
2188 struct hci_ev_cmd_complete *ev = (void *) skb->data; 2096 struct hci_ev_cmd_complete *ev = (void *) skb->data;
@@ -2270,10 +2178,6 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
2270 hci_cc_write_voice_setting(hdev, skb); 2178 hci_cc_write_voice_setting(hdev, skb);
2271 break; 2179 break;
2272 2180
2273 case HCI_OP_HOST_BUFFER_SIZE:
2274 hci_cc_host_buffer_size(hdev, skb);
2275 break;
2276
2277 case HCI_OP_WRITE_SSP_MODE: 2181 case HCI_OP_WRITE_SSP_MODE:
2278 hci_cc_write_ssp_mode(hdev, skb); 2182 hci_cc_write_ssp_mode(hdev, skb);
2279 break; 2183 break;
@@ -2306,10 +2210,6 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
2306 hci_cc_read_data_block_size(hdev, skb); 2210 hci_cc_read_data_block_size(hdev, skb);
2307 break; 2211 break;
2308 2212
2309 case HCI_OP_WRITE_CA_TIMEOUT:
2310 hci_cc_write_ca_timeout(hdev, skb);
2311 break;
2312
2313 case HCI_OP_READ_FLOW_CONTROL_MODE: 2213 case HCI_OP_READ_FLOW_CONTROL_MODE:
2314 hci_cc_read_flow_control_mode(hdev, skb); 2214 hci_cc_read_flow_control_mode(hdev, skb);
2315 break; 2215 break;
@@ -2322,26 +2222,10 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
2322 hci_cc_read_local_amp_assoc(hdev, skb); 2222 hci_cc_read_local_amp_assoc(hdev, skb);
2323 break; 2223 break;
2324 2224
2325 case HCI_OP_DELETE_STORED_LINK_KEY:
2326 hci_cc_delete_stored_link_key(hdev, skb);
2327 break;
2328
2329 case HCI_OP_SET_EVENT_MASK:
2330 hci_cc_set_event_mask(hdev, skb);
2331 break;
2332
2333 case HCI_OP_WRITE_INQUIRY_MODE:
2334 hci_cc_write_inquiry_mode(hdev, skb);
2335 break;
2336
2337 case HCI_OP_READ_INQ_RSP_TX_POWER: 2225 case HCI_OP_READ_INQ_RSP_TX_POWER:
2338 hci_cc_read_inq_rsp_tx_power(hdev, skb); 2226 hci_cc_read_inq_rsp_tx_power(hdev, skb);
2339 break; 2227 break;
2340 2228
2341 case HCI_OP_SET_EVENT_FLT:
2342 hci_cc_set_event_flt(hdev, skb);
2343 break;
2344
2345 case HCI_OP_PIN_CODE_REPLY: 2229 case HCI_OP_PIN_CODE_REPLY:
2346 hci_cc_pin_code_reply(hdev, skb); 2230 hci_cc_pin_code_reply(hdev, skb);
2347 break; 2231 break;
@@ -2366,10 +2250,6 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
2366 hci_cc_le_read_adv_tx_power(hdev, skb); 2250 hci_cc_le_read_adv_tx_power(hdev, skb);
2367 break; 2251 break;
2368 2252
2369 case HCI_OP_LE_SET_EVENT_MASK:
2370 hci_cc_le_set_event_mask(hdev, skb);
2371 break;
2372
2373 case HCI_OP_USER_CONFIRM_REPLY: 2253 case HCI_OP_USER_CONFIRM_REPLY:
2374 hci_cc_user_confirm_reply(hdev, skb); 2254 hci_cc_user_confirm_reply(hdev, skb);
2375 break; 2255 break;
@@ -2402,14 +2282,6 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
2402 hci_cc_le_read_white_list_size(hdev, skb); 2282 hci_cc_le_read_white_list_size(hdev, skb);
2403 break; 2283 break;
2404 2284
2405 case HCI_OP_LE_LTK_REPLY:
2406 hci_cc_le_ltk_reply(hdev, skb);
2407 break;
2408
2409 case HCI_OP_LE_LTK_NEG_REPLY:
2410 hci_cc_le_ltk_neg_reply(hdev, skb);
2411 break;
2412
2413 case HCI_OP_LE_READ_SUPPORTED_STATES: 2285 case HCI_OP_LE_READ_SUPPORTED_STATES:
2414 hci_cc_le_read_supported_states(hdev, skb); 2286 hci_cc_le_read_supported_states(hdev, skb);
2415 break; 2287 break;
@@ -2501,10 +2373,6 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
2501 hci_cs_le_create_conn(hdev, ev->status); 2373 hci_cs_le_create_conn(hdev, ev->status);
2502 break; 2374 break;
2503 2375
2504 case HCI_OP_LE_START_ENC:
2505 hci_cs_le_start_enc(hdev, ev->status);
2506 break;
2507
2508 case HCI_OP_CREATE_PHY_LINK: 2376 case HCI_OP_CREATE_PHY_LINK:
2509 hci_cs_create_phylink(hdev, ev->status); 2377 hci_cs_create_phylink(hdev, ev->status);
2510 break; 2378 break;
@@ -2513,10 +2381,6 @@ static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
2513 hci_cs_accept_phylink(hdev, ev->status); 2381 hci_cs_accept_phylink(hdev, ev->status);
2514 break; 2382 break;
2515 2383
2516 case HCI_OP_CREATE_LOGICAL_LINK:
2517 hci_cs_create_logical_link(hdev, ev->status);
2518 break;
2519
2520 default: 2384 default:
2521 BT_DBG("%s opcode 0x%4.4x", hdev->name, opcode); 2385 BT_DBG("%s opcode 0x%4.4x", hdev->name, opcode);
2522 break; 2386 break;
@@ -3077,18 +2941,6 @@ unlock:
3077 hci_dev_unlock(hdev); 2941 hci_dev_unlock(hdev);
3078} 2942}
3079 2943
3080static void hci_sync_conn_changed_evt(struct hci_dev *hdev, struct sk_buff *skb)
3081{
3082 BT_DBG("%s", hdev->name);
3083}
3084
3085static void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *skb)
3086{
3087 struct hci_ev_sniff_subrate *ev = (void *) skb->data;
3088
3089 BT_DBG("%s status 0x%2.2x", hdev->name, ev->status);
3090}
3091
3092static void hci_extended_inquiry_result_evt(struct hci_dev *hdev, 2944static void hci_extended_inquiry_result_evt(struct hci_dev *hdev,
3093 struct sk_buff *skb) 2945 struct sk_buff *skb)
3094{ 2946{
@@ -3816,14 +3668,6 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)
3816 hci_remote_features_evt(hdev, skb); 3668 hci_remote_features_evt(hdev, skb);
3817 break; 3669 break;
3818 3670
3819 case HCI_EV_REMOTE_VERSION:
3820 hci_remote_version_evt(hdev, skb);
3821 break;
3822
3823 case HCI_EV_QOS_SETUP_COMPLETE:
3824 hci_qos_setup_complete_evt(hdev, skb);
3825 break;
3826
3827 case HCI_EV_CMD_COMPLETE: 3671 case HCI_EV_CMD_COMPLETE:
3828 hci_cmd_complete_evt(hdev, skb); 3672 hci_cmd_complete_evt(hdev, skb);
3829 break; 3673 break;
@@ -3880,14 +3724,6 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb)
3880 hci_sync_conn_complete_evt(hdev, skb); 3724 hci_sync_conn_complete_evt(hdev, skb);
3881 break; 3725 break;
3882 3726
3883 case HCI_EV_SYNC_CONN_CHANGED:
3884 hci_sync_conn_changed_evt(hdev, skb);
3885 break;
3886
3887 case HCI_EV_SNIFF_SUBRATE:
3888 hci_sniff_subrate_evt(hdev, skb);
3889 break;
3890
3891 case HCI_EV_EXTENDED_INQUIRY_RESULT: 3727 case HCI_EV_EXTENDED_INQUIRY_RESULT:
3892 hci_extended_inquiry_result_evt(hdev, skb); 3728 hci_extended_inquiry_result_evt(hdev, skb);
3893 break; 3729 break;