Bluetooth: hci_event: Remove code to removed CONFIG_BT_HS

[ Upstream commit f4b0c2b4cd78b75acde56c2ee5aa732b6fb2a6a9 ]

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.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Stable-dep-of: 84a4bb6548a2 ("Bluetooth: HCI: Remove HCI_AMP support")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index c19d78e5d2053ffe7aba0d020d6f095db3a1d6ab..4de8f0dc1a5239e8343a49df22ba36604e482dd4 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -5697,150 +5697,6 @@ unlock:
        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)
 {
@@ -7656,25 +7512,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)),