| Message ID | 20240618185932.49963-1-dmantipov@yandex.ru |
|---|---|
| State | Accepted |
| Commit | 775f749267eb078cd9b6904c8a2322f1276e2f60 |
| Headers | show |
| Series | Bluetooth: hci_core, hci_sync: cleanup struct discovery_state | expand |
Hello: This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: On Tue, 18 Jun 2024 21:59:32 +0300 you wrote: > After commit 78db544b5d27 ("Bluetooth: hci_core: Remove le_restart_scan > work"), 'scan_start' and 'scan_duration' of 'struct discovery_state' > are still initialized but actually unused. So remove the aforementioned > fields and adjust 'hci_discovery_filter_clear()' and 'le_scan_disable()' > accordingly. Compile tested only. > > Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> > > [...] Here is the summary with links: - Bluetooth: hci_core, hci_sync: cleanup struct discovery_state https://git.kernel.org/bluetooth/bluetooth-next/c/775f749267eb You are awesome, thank you!
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index c43716edf205..b15f51ae3bfd 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -91,8 +91,6 @@ struct discovery_state { s8 rssi; u16 uuid_count; u8 (*uuids)[16]; - unsigned long scan_start; - unsigned long scan_duration; unsigned long name_resolve_timeout; }; @@ -890,8 +888,6 @@ static inline void hci_discovery_filter_clear(struct hci_dev *hdev) hdev->discovery.uuid_count = 0; kfree(hdev->discovery.uuids); hdev->discovery.uuids = NULL; - hdev->discovery.scan_start = 0; - hdev->discovery.scan_duration = 0; } bool hci_discovery_active(struct hci_dev *hdev); diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index a8a7d2b36870..d126b4ef4e0b 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -358,8 +358,6 @@ static void le_scan_disable(struct work_struct *work) goto _return; } - hdev->discovery.scan_start = 0; - /* If we were running LE only scan, change discovery state. If * we were running both LE and BR/EDR inquiry simultaneously, * and BR/EDR inquiry is already finished, stop discovery,
After commit 78db544b5d27 ("Bluetooth: hci_core: Remove le_restart_scan work"), 'scan_start' and 'scan_duration' of 'struct discovery_state' are still initialized but actually unused. So remove the aforementioned fields and adjust 'hci_discovery_filter_clear()' and 'le_scan_disable()' accordingly. Compile tested only. Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> --- include/net/bluetooth/hci_core.h | 4 ---- net/bluetooth/hci_sync.c | 2 -- 2 files changed, 6 deletions(-)