Skip to content

Commit 3ba74b2

Browse files
dmantipovVudentz
authored andcommitted
Bluetooth: hci_core: cleanup struct hci_dev
Remove unused and set but otherwise unused 'discovery_old_state' and 'sco_last_tx' members of 'struct hci_dev'. The first one is a leftover after commit 182ee45 ("Bluetooth: hci_sync: Rework hci_suspend_notifier"); the second one is originated from ancient 2.4.19 and I was unable to find any actual use since that. Signed-off-by: Dmitry Antipov <[email protected]> Reviewed-by: Paul Menzel <[email protected]> Signed-off-by: Luiz Augusto von Dentz <[email protected]>
1 parent 1723b55 commit 3ba74b2

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

include/net/bluetooth/hci_core.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,6 @@ struct hci_dev {
476476
unsigned int iso_pkts;
477477

478478
unsigned long acl_last_tx;
479-
unsigned long sco_last_tx;
480479
unsigned long le_last_tx;
481480

482481
__u8 le_tx_def_phys;
@@ -528,7 +527,6 @@ struct hci_dev {
528527

529528
struct discovery_state discovery;
530529

531-
int discovery_old_state;
532530
bool discovery_paused;
533531
int advertising_old_state;
534532
bool advertising_paused;

net/bluetooth/hci_sync.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5853,7 +5853,6 @@ static int hci_pause_discovery_sync(struct hci_dev *hdev)
58535853
return err;
58545854

58555855
hdev->discovery_paused = true;
5856-
hdev->discovery_old_state = old_state;
58575856
hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
58585857

58595858
return 0;

0 commit comments

Comments
 (0)