aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2011-11-07 15:16:04 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2011-11-08 09:54:10 -0500
commit3243553fdc108a0ef49b9e25bdea9c87b341413e (patch)
treeb0ef367f37653b6fdefa3b028fdc0f2e685e5b2e /include/net
parent2d7cee5836d6d466829b255b1290c9386d4e884f (diff)
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/net')
-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 {
193 struct workqueue_struct *workqueue; 193 struct workqueue_struct *workqueue;
194 194
195 struct work_struct power_on; 195 struct work_struct power_on;
196 struct work_struct power_off; 196 struct delayed_work power_off;
197 struct timer_list off_timer;
198 197
199 __u16 discov_timeout; 198 __u16 discov_timeout;
200 struct delayed_work discov_off; 199 struct delayed_work discov_off;