iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: Convert power off mechanism to use delayed_work

Browse Source 
The power off code doesn't need to use its own custom timer since the
delayed_work API provides the exact same functionality.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Johan Hedberg
2011-11-07 22:16:04 +02:00
committed by Gustavo F. Padovan
parent 2d7cee5836
commit 3243553fdc
3 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/bluetooth/mgmt.c
View File

@ -150,7 +150,8 @@ static int read_index_list(struct sock *sk)
i = 0;
list_for_each_entry(d, &hci_dev_list, list) {
hci_del_off_timer(d);
if (test_and_clear_bit(HCI_AUTO_OFF, &d->flags))
cancel_delayed_work_sync(&d->power_off);
if (test_bit(HCI_SETUP, &d->flags))
continue;
@ -180,7 +181,8 @@ static int read_controller_info(struct sock *sk, u16 index)
if (!hdev)
return cmd_status(sk, index, MGMT_OP_READ_INFO, ENODEV);
hci_del_off_timer(hdev);
if (test_and_clear_bit(HCI_AUTO_OFF, &hdev->flags))
cancel_delayed_work_sync(&hdev->power_off);
hci_dev_lock_bh(hdev);
@ -337,7 +339,7 @@ static int set_powered(struct sock *sk, u16 index, unsigned char *data, u16 len)
if (cp->val)
queue_work(hdev->workqueue, &hdev->power_on);
else
queue_work(hdev->workqueue, &hdev->power_off);
queue_work(hdev->workqueue, &hdev->power_off.work);
err = 0;