Bluetooth: hci_event: Remove code to removed CONFIG_BT_HS
Subsystems (3)
PATCH 1/1 Bluetooth: hci_event: Remove code to removed CONFIG_BT_HS
Commit cec9f3c5561d ("Bluetooth: Remove BT_HS") removes config BT_HS, but misses two "ifdef BT_HS" blocks in hci_event.c.
Remove this dead code from this removed config option.
--- net/bluetooth/hci_event.c | 163 -------------------------------------- 1 file changed, 163 deletions(-)
net/bluetooth/hci_event.c +0 -163
@@ -5676,150 +5676,6 @@ static void hci_remote_oob_data_request_evt(struct hci_dev *hdev, void *edata,hci_dev_unlock (hdev); } -#if IS_ENABLED (CONFIG_BT_HS ) -static void hci_chan_selected_evt (struct hci_dev *hdev,void *data, -struct sk_buff *skb) -{ -struct hci_ev_channel_selected *ev = data; -struct hci_conn *hcon; - -bt_dev_dbg (hdev,"handle 0x%2.2x" , ev->phy_handle); - - hcon =hci_conn_hash_lookup_handle (hdev, ev->phy_handle); -if (!hcon) -return ; - -amp_read_loc_assoc_final_data (hdev, hcon); -} - -static void hci_phy_link_complete_evt (struct hci_dev *hdev,void *data, -struct sk_buff *skb) -{ -struct hci_ev_phy_link_complete *ev = data; -struct hci_conn *hcon, *bredr_hcon; - -bt_dev_dbg (hdev,"handle 0x%2.2x status 0x%2.2x" , ev->phy_handle, - ev->status); - -hci_dev_lock (hdev); - - hcon =hci_conn_hash_lookup_handle (hdev, ev->phy_handle); -if (!hcon) - goto unlock; - -if (!hcon->amp_mgr) - goto unlock; - -if (ev->status) { -hci_conn_del (hcon); - goto unlock; - } - - bredr_hcon = hcon->amp_mgr->l2cap_conn->hcon; - - hcon->state =BT_CONNECTED ; -bacpy (&hcon->dst, &bredr_hcon->dst); - -hci_conn_hold (hcon); - hcon->disc_timeout =HCI_DISCONN_TIMEOUT ; -hci_conn_drop (hcon); - -hci_debugfs_create_conn (hcon); -hci_conn_add_sysfs (hcon); - -amp_physical_cfm (bredr_hcon, hcon); - -unlock: -hci_dev_unlock (hdev); -} - -static void hci_loglink_complete_evt (struct hci_dev *hdev,void *data, -struct sk_buff *skb) -{ -struct hci_ev_logical_link_complete *ev = data; -struct hci_conn *hcon; -struct hci_chan *hchan; -struct amp_mgr *mgr; - -bt_dev_dbg (hdev,"log_handle 0x%4.4x phy_handle 0x%2.2x status 0x%2.2x" , -le16_to_cpu (ev->handle), ev->phy_handle, ev->status); - - hcon =hci_conn_hash_lookup_handle (hdev, ev->phy_handle); -if (!hcon) -return ; - -/* Create AMP hchan */ - hchan =hci_chan_create (hcon); -if (!hchan) -return ; - - hchan->handle =le16_to_cpu (ev->handle); - hchan->amp = true; - -BT_DBG ("hcon %p mgr %p hchan %p" , hcon, hcon->amp_mgr, hchan); - - mgr = hcon->amp_mgr; -if (mgr && mgr->bredr_chan) { -struct l2cap_chan *bredr_chan = mgr->bredr_chan; - -l2cap_chan_lock (bredr_chan); - - bredr_chan->conn->mtu = hdev->block_mtu; -l2cap_logical_cfm (bredr_chan, hchan,0 ); -hci_conn_hold (hcon); - -l2cap_chan_unlock (bredr_chan); - } -} - -static void hci_disconn_loglink_complete_evt (struct hci_dev *hdev,void *data, -struct sk_buff *skb) -{ -struct hci_ev_disconn_logical_link_complete *ev = data; -struct hci_chan *hchan; - -bt_dev_dbg (hdev,"handle 0x%4.4x status 0x%2.2x" , -le16_to_cpu (ev->handle), ev->status); - -if (ev->status) -return ; - -hci_dev_lock (hdev); - - hchan =hci_chan_lookup_handle (hdev,le16_to_cpu (ev->handle)); -if (!hchan || !hchan->amp) - goto unlock; - -amp_destroy_logical_link (hchan, ev->reason); - -unlock: -hci_dev_unlock (hdev); -} - -static void hci_disconn_phylink_complete_evt (struct hci_dev *hdev,void *data, -struct sk_buff *skb) -{ -struct hci_ev_disconn_phy_link_complete *ev = data; -struct hci_conn *hcon; - -bt_dev_dbg (hdev,"status 0x%2.2x" , ev->status); - -if (ev->status) -return ; - -hci_dev_lock (hdev); - - hcon =hci_conn_hash_lookup_handle (hdev, ev->phy_handle); -if (hcon && hcon->type ==AMP_LINK ) { - hcon->state =BT_CLOSED ; -hci_disconn_cfm (hcon, ev->reason); -hci_conn_del (hcon); - } - -hci_dev_unlock (hdev); -} -#endif -static void le_conn_update_addr (struct hci_conn *conn,bdaddr_t *bdaddr,u8 bdaddr_type,bdaddr_t *local_rpa) {
@@ -7629,25 +7485,6 @@ static const struct hci_ev {/* [0x3e = HCI_EV_LE_META] */ HCI_EV_REQ_VL (HCI_EV_LE_META , hci_le_meta_evt,sizeof (struct hci_ev_le_meta ),HCI_MAX_EVENT_SIZE ), -#if IS_ENABLED(CONFIG_BT_HS) -/* [0x40 = HCI_EV_PHY_LINK_COMPLETE] */ -HCI_EV (HCI_EV_PHY_LINK_COMPLETE , hci_phy_link_complete_evt, -sizeof (struct hci_ev_phy_link_complete )), -/* [0x41 = HCI_EV_CHANNEL_SELECTED] */ -HCI_EV (HCI_EV_CHANNEL_SELECTED , hci_chan_selected_evt, -sizeof (struct hci_ev_channel_selected )), -/* [0x42 = HCI_EV_DISCONN_PHY_LINK_COMPLETE] */ -HCI_EV (HCI_EV_DISCONN_LOGICAL_LINK_COMPLETE , - hci_disconn_loglink_complete_evt, -sizeof (struct hci_ev_disconn_logical_link_complete )), -/* [0x45 = HCI_EV_LOGICAL_LINK_COMPLETE] */ -HCI_EV (HCI_EV_LOGICAL_LINK_COMPLETE , hci_loglink_complete_evt, -sizeof (struct hci_ev_logical_link_complete )), -/* [0x46 = HCI_EV_DISCONN_LOGICAL_LINK_COMPLETE] */ -HCI_EV (HCI_EV_DISCONN_PHY_LINK_COMPLETE , - hci_disconn_phylink_complete_evt, -sizeof (struct hci_ev_disconn_phy_link_complete )), -#endif/* [0x48 = HCI_EV_NUM_COMP_BLOCKS] */ HCI_EV (HCI_EV_NUM_COMP_BLOCKS , hci_num_comp_blocks_evt, sizeof(struct hci_ev_num_comp_blocks)),
Signature · 1 line
2.17.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=823967
---Test result---
Test Summary:
CheckPatch PASS 0.64 seconds GitLint PASS 0.32 seconds SubjectPrefix PASS 0.12 seconds BuildKernel PASS 28.90 seconds CheckAllWarning PASS 31.74 seconds CheckSparse WARNING 38.28 seconds CheckSmatch WARNING 101.01 seconds BuildKernel32 PASS 27.68 seconds TestRunnerSetup PASS 512.95 seconds TestRunner_l2cap-tester PASS 18.39 seconds TestRunner_iso-tester PASS 31.07 seconds TestRunner_bnep-tester PASS 4.88 seconds TestRunner_mgmt-tester FAIL 110.49 seconds TestRunner_rfcomm-tester PASS 7.54 seconds TestRunner_sco-tester PASS 11.34 seconds TestRunner_ioctl-tester PASS 8.18 seconds TestRunner_mesh-tester PASS 6.09 seconds TestRunner_smp-tester PASS 6.97 seconds TestRunner_userchan-tester PASS 5.08 seconds IncrementalBuild PASS 30.42 seconds
Details
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 497, Passed: 487 (98.0%), Failed: 3, Not Run: 7
Failed Test Cases
LL Privacy - Add Device 6 (RL is full) Failed 0.198 seconds LL Privacy - Add Device 7 (AL is full) Failed 0.198 seconds LL Privacy - Remove Device 4 (Disable Adv) Timed out 2.643 seconds
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 8 lines · On Wed, 7 Feb 2024 14:42:11 +0100 you wrote:
Commit
cec9f3c5561d("Bluetooth: RemoveBT_HS") removes configBT_HS, but misses two "ifdefBT_HS" blocks inhci_event.c.Remove this dead code from this removed config option.
Signed-off-by Lukas Bulwahn <[email protected]>[...]
Here is the summary with links:
- Bluetooth: hci_event: Remove code to removed CONFIG_BT_HS
https://git.kernel.org/bluetooth/bluetooth-next/c/854c513be130
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html