Bluetooth: Helper removes duplicated code

Use __check_timout helper to remove duplicated code

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Reviewed-by: Ulisses Furquim <ulisses@profusion.mobi>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 9a56a4084482a6433ceb72c925b7d68ce70db554..95eeae59812de98f350ea355bd5469fa8dcc6972 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2390,22 +2390,25 @@ static inline int __get_blocks(struct hci_dev *hdev, struct sk_buff *skb)
        return DIV_ROUND_UP(skb->len - HCI_ACL_HDR_SIZE, hdev->block_len);
 }
 
-static inline void hci_sched_acl_pkt(struct hci_dev *hdev)
+static inline void __check_timeout(struct hci_dev *hdev, unsigned int cnt)
 {
-       struct hci_chan *chan;
-       struct sk_buff *skb;
-       int quote;
-       unsigned int cnt;
-
        if (!test_bit(HCI_RAW, &hdev->flags)) {
                /* ACL tx timeout must be longer than maximum
                 * link supervision timeout (40.9 seconds) */
-               if (!hdev->acl_cnt && time_after(jiffies, hdev->acl_last_tx +
+               if (!cnt && time_after(jiffies, hdev->acl_last_tx +
                                        msecs_to_jiffies(HCI_ACL_TX_TIMEOUT)))
                        hci_link_tx_to(hdev, ACL_LINK);
        }
+}
 
-       cnt = hdev->acl_cnt;
+static inline void hci_sched_acl_pkt(struct hci_dev *hdev)
+{
+       unsigned int cnt = hdev->acl_cnt;
+       struct hci_chan *chan;
+       struct sk_buff *skb;
+       int quote;
+
+       __check_timeout(hdev, cnt);
 
        while (hdev->acl_cnt &&
                        (chan = hci_chan_sent(hdev, ACL_LINK, &quote))) {
@@ -2438,20 +2441,12 @@ static inline void hci_sched_acl_pkt(struct hci_dev *hdev)
 
 static inline void hci_sched_acl_blk(struct hci_dev *hdev)
 {
+       unsigned int cnt = hdev->block_cnt;
        struct hci_chan *chan;
        struct sk_buff *skb;
        int quote;
-       unsigned int cnt;
-
-       if (!test_bit(HCI_RAW, &hdev->flags)) {
-               /* ACL tx timeout must be longer than maximum
-                * link supervision timeout (40.9 seconds) */
-               if (!hdev->block_cnt && time_after(jiffies, hdev->acl_last_tx +
-                                       msecs_to_jiffies(HCI_ACL_TX_TIMEOUT)))
-                       hci_link_tx_to(hdev, ACL_LINK);
-       }
 
-       cnt = hdev->block_cnt;
+       __check_timeout(hdev, cnt);
 
        while (hdev->block_cnt > 0 &&
                        (chan = hci_chan_sent(hdev, ACL_LINK, &quote))) {