summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohan Hedberg2011-11-07 21:16:04 +0100
committerGustavo F. Padovan2011-11-08 15:54:10 +0100
commit3243553fdc108a0ef49b9e25bdea9c87b341413e (patch)
treeb0ef367f37653b6fdefa3b028fdc0f2e685e5b2e /include
parentBluetooth: Fix mgmt response when HCI_Write_Scan_Enable fails (diff)
downloadkernel-qcow2-linux-3243553fdc108a0ef49b9e25bdea9c87b341413e.tar.gz
kernel-qcow2-linux-3243553fdc108a0ef49b9e25bdea9c87b341413e.tar.xz
kernel-qcow2-linux-3243553fdc108a0ef49b9e25bdea9c87b341413e.zip
Bluetooth: Convert power off mechanism to use delayed_work
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>
Diffstat (limited to 'include')
-rw-r--r--include/net/bluetooth/hci_core.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index c233bceb3ccc..bca53aa754e3 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -193,8 +193,7 @@ struct hci_dev {
struct workqueue_struct *workqueue;
struct work_struct power_on;
- struct work_struct power_off;
- struct timer_list off_timer;
+ struct delayed_work power_off;
__u16 discov_timeout;
struct delayed_work discov_off;