Commit da63f331 authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: hci_core, hci_sync: cleanup struct discovery_state 



After commit 78db544b ("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.

Fixes: 78db544b ("Bluetooth: hci_core: Remove le_restart_scan work")
Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 295ef07a

include/net/bluetooth/hci_core.h

+0 −4
Original line number Diff line number Diff line
@@ -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;

};
@@ -891,8 +889,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);

net/bluetooth/hci_sync.c

+0 −2
Original line number Diff line number Diff line
@@ -371,8 +371,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,