diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-16 11:11:40 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2013-10-16 12:12:13 -0400 |
commit | a74a84f696537f38fa994c1b95a0dca9ae386865 (patch) | |
tree | 0d6ac825ac9843576b9e0dc3ba55c76219438cae /include | |
parent | 7bc18d9d3d7ffbc09dabb201933a063583a39027 (diff) |
Bluetooth: Convert idle timer to use delayed work
There is no need to use a timer since the entire Bluetooth subsystem
runs using workqueues these days.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/bluetooth/hci_core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 2504a2553baa..07c2da4854ab 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -342,7 +342,7 @@ struct hci_conn { | |||
342 | 342 | ||
343 | struct delayed_work disc_work; | 343 | struct delayed_work disc_work; |
344 | struct delayed_work auto_accept_work; | 344 | struct delayed_work auto_accept_work; |
345 | struct timer_list idle_timer; | 345 | struct delayed_work idle_work; |
346 | 346 | ||
347 | struct device dev; | 347 | struct device dev; |
348 | 348 | ||
@@ -651,7 +651,7 @@ static inline void hci_conn_drop(struct hci_conn *conn) | |||
651 | switch (conn->type) { | 651 | switch (conn->type) { |
652 | case ACL_LINK: | 652 | case ACL_LINK: |
653 | case LE_LINK: | 653 | case LE_LINK: |
654 | del_timer(&conn->idle_timer); | 654 | cancel_delayed_work(&conn->idle_work); |
655 | if (conn->state == BT_CONNECTED) { | 655 | if (conn->state == BT_CONNECTED) { |
656 | timeo = conn->disc_timeout; | 656 | timeo = conn->disc_timeout; |
657 | if (!conn->out) | 657 | if (!conn->out) |