Bluetooth: Comments and style fixes
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Fri, 23 Mar 2012 14:31:50 +0000 (16:31 +0200)
committerGustavo Padovan <gustavo@padovan.org>
Wed, 9 May 2012 03:41:35 +0000 (00:41 -0300)
Add comments to timer implementation and style fixes.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
include/net/bluetooth/l2cap.h

index 9b242c6bf55b2d9ecf8b0bebb725a45b1a7ee947..35334a0de070012e99621848e6e1a5f59ce69eb9 100644 (file)
@@ -622,21 +622,26 @@ static inline void l2cap_chan_unlock(struct l2cap_chan *chan)
 }
 
 static inline void l2cap_set_timer(struct l2cap_chan *chan,
-                                       struct delayed_work *work, long timeout)
+                                  struct delayed_work *work, long timeout)
 {
        BT_DBG("chan %p state %s timeout %ld", chan,
-                                       state_to_string(chan->state), timeout);
+              state_to_string(chan->state), timeout);
 
+       /* If delayed work cancelled do not hold(chan)
+          since it is already done with previous set_timer */
        if (!cancel_delayed_work(work))
                l2cap_chan_hold(chan);
+
        schedule_delayed_work(work, timeout);
 }
 
 static inline bool l2cap_clear_timer(struct l2cap_chan *chan,
-                                       struct delayed_work *work)
+                                    struct delayed_work *work)
 {
        bool ret;
 
+       /* put(chan) if delayed work cancelled otherwise it
+          is done in delayed work function */
        ret = cancel_delayed_work(work);
        if (ret)
                l2cap_chan_put(chan);