Bluetooth: MGMT: Deadcode cleanup
Subsystems (4)
cover Bluetooth: MGMT: Deadcode cleanup
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
A couple of deadcode removal patches.
They're both strictly function removals, no internal changes to a function.
Build tested only.
Dr. David Alan Gilbert (2):
Bluetooth: MGMT: Remove unused mgmt_pending_find_data
Bluetooth: MGMT: Remove unused mgmt_*_discovery_complete
include/net/bluetooth/hci_core.h | 2 -- net/bluetooth/mgmt.c | 40 -------------------------------- net/bluetooth/mgmt_util.c | 17 -------------- net/bluetooth/mgmt_util.h | 4 ---- 4 files changed, 63 deletions(-)
Signature · 1 line
2.48.1
PATCH 1/2 Bluetooth: MGMT: Remove unused mgmt_pending_find_data
From: "Dr. David Alan Gilbert" <[email protected]>
mgmt_pending_find_data() last use was removed in 2021 by
commit 5a7501374664 ("Bluetooth: hci_sync: Convert MGMT_OP_GET_CLOCK_INFO")
Remove it.
--- net/bluetooth/mgmt_util.c | 17 ----------------- net/bluetooth/mgmt_util.h | 4 ---- 2 files changed, 21 deletions(-)
net/bluetooth/mgmt_util.c +0 -17
@@ -229,23 +229,6 @@ struct mgmt_pending_cmd *mgmt_pending_find(unsigned short channel, u16 opcode,return NULL ; } -struct mgmt_pending_cmd *mgmt_pending_find_data (unsigned short channel, -u16 opcode, -struct hci_dev *hdev, -const void *data) -{ -struct mgmt_pending_cmd *cmd; - -list_for_each_entry (cmd, &hdev->mgmt_pending, list) { -if (cmd->user_data != data) -continue ; -if (cmd->opcode == opcode) -return cmd; - } - -return NULL ; -} -void mgmt_pending_foreach (u16 opcode,struct hci_dev *hdev,void (*cb)(struct mgmt_pending_cmd *cmd,void *data),void *data)
net/bluetooth/mgmt_util.h +0 -4
@@ -54,10 +54,6 @@ int mgmt_cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,struct mgmt_pending_cmd *mgmt_pending_find (unsigned short channel,u16 opcode,struct hci_dev *hdev); -struct mgmt_pending_cmd *mgmt_pending_find_data (unsigned short channel, -u16 opcode, -struct hci_dev *hdev, -const void *data);void mgmt_pending_foreach (u16 opcode,struct hci_dev *hdev,void (*cb)(struct mgmt_pending_cmd *cmd,void *data),void *data);
Signature · 1 line
2.48.1
Re: [PATCH 1/2] Bluetooth: MGMT: Remove unused mgmt_pending_find_data
Quoted 8 lines · On Mon, Jan 27, 2025 at 09:37:15PM +0000, [email protected] wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
mgmt_pending_find_data()last use was removed in 2021 by
commit5a7501374664("Bluetooth:hci_sync: ConvertMGMT_OP_GET_CLOCK_INFO")Remove it.
Signed-off-by Dr. David Alan Gilbert <[email protected]>
PATCH 2/2 Bluetooth: MGMT: Remove unused mgmt_*_discovery_complete
In reply to [email protected]From: "Dr. David Alan Gilbert" <[email protected]>
mgmt_start_discovery_complete() and mgmt_stop_discovery_complete() last uses were removed in 2022 by
commit ec2904c259c5 ("Bluetooth: Remove dead code from hci_request.c")
Remove them.
--- include/net/bluetooth/hci_core.h | 2 -- net/bluetooth/mgmt.c | 40 -------------------------------- 2 files changed, 42 deletions(-)
include/net/bluetooth/hci_core.h +0 -2
@@ -2386,8 +2386,6 @@ void mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status);void mgmt_set_class_of_dev_complete (struct hci_dev *hdev,u8 *dev_class,u8 status);void mgmt_set_local_name_complete (struct hci_dev *hdev,u8 *name,u8 status); -void mgmt_start_discovery_complete (struct hci_dev *hdev,u8 status); -void mgmt_stop_discovery_complete (struct hci_dev *hdev,u8 status); void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, u8 addr_type, u8 *dev_class, s8 rssi, u32 flags, u8 *eir, u16 eir_len, u8 *scan_rsp, u8 scan_rsp_len,
net/bluetooth/mgmt.c +0 -40
@@ -5743,29 +5743,6 @@ static int remove_remote_oob_data(struct sock *sk, struct hci_dev *hdev,return err; } -void mgmt_start_discovery_complete (struct hci_dev *hdev,u8 status) -{ -struct mgmt_pending_cmd *cmd; - -bt_dev_dbg (hdev,"status %u" , status); - -hci_dev_lock (hdev); - - cmd =pending_find (MGMT_OP_START_DISCOVERY , hdev); -if (!cmd) - cmd =pending_find (MGMT_OP_START_SERVICE_DISCOVERY , hdev); - -if (!cmd) - cmd =pending_find (MGMT_OP_START_LIMITED_DISCOVERY , hdev); - -if (cmd) { - cmd->cmd_complete (cmd,mgmt_status (status)); -mgmt_pending_remove (cmd); - } - -hci_dev_unlock (hdev); -} -static bool discovery_type_is_valid (struct hci_dev *hdev,uint8_t type,uint8_t *mgmt_status) {
@@ -6018,23 +5995,6 @@ static int start_service_discovery(struct sock *sk, struct hci_dev *hdev,return err; } -void mgmt_stop_discovery_complete (struct hci_dev *hdev,u8 status) -{ -struct mgmt_pending_cmd *cmd; - -bt_dev_dbg (hdev,"status %u" , status); - -hci_dev_lock (hdev); - - cmd =pending_find (MGMT_OP_STOP_DISCOVERY , hdev); -if (cmd) { - cmd->cmd_complete (cmd,mgmt_status (status)); -mgmt_pending_remove (cmd); - } - -hci_dev_unlock (hdev); -} -static void stop_discovery_complete (struct hci_dev *hdev,void *data,int err) {struct mgmt_pending_cmd *cmd = data;
Signature · 1 line
2.48.1
Re: [PATCH 2/2] Bluetooth: MGMT: Remove unused mgmt_*_discovery_complete
Quoted 9 lines · On Mon, Jan 27, 2025 at 09:37:16PM +0000, [email protected] wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
mgmt_start_discovery_complete()andmgmt_stop_discovery_complete()last uses were removed in 2022 by
commitec2904c259c5("Bluetooth: Remove dead code fromhci_request.c")Remove them.
Signed-off-by Dr. David Alan Gilbert <[email protected]>
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 9 lines · On Mon, 27 Jan 2025 21:37:14 +0000 you wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
A couple of deadcode removal patches.They're both strictly function removals, no internal changes to a function.
[...]
Here is the summary with links:
- [1/2] Bluetooth: MGMT: Remove unused mgmt_pending_find_data
https://git.kernel.org/bluetooth/bluetooth-next/c/f694e720fddd - [2/2] Bluetooth: MGMT: Remove unused mgmt_*_discovery_complete https://git.kernel.org/bluetooth/bluetooth-next/c/55b8d4c01dde
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html