Bluetooth: Rename hci_request to hci_req_sync

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / bluetooth / hci_core.c

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 60793e7b768bb702321c2a2dbdefab089bfd555b..551df8a6f983ef08df1be23db96b7d9a421d8a04 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -107,9 +107,9 @@ static void hci_req_cancel(struct hci_dev *hdev, int err)
 }
 
 /* Execute request and wait for completion. */
-static int __hci_request(struct hci_dev *hdev,
-                        void (*req)(struct hci_dev *hdev, unsigned long opt),
-                        unsigned long opt, __u32 timeout)
+static int __hci_req_sync(struct hci_dev *hdev,
+                         void (*req)(struct hci_dev *hdev, unsigned long opt),
+                         unsigned long opt, __u32 timeout)
 {
        DECLARE_WAITQUEUE(wait, current);
        int err = 0;
@@ -150,9 +150,9 @@ static int __hci_request(struct hci_dev *hdev,
        return err;
 }
 
-static int hci_request(struct hci_dev *hdev,
-                      void (*req)(struct hci_dev *hdev, unsigned long opt),
-                      unsigned long opt, __u32 timeout)
+static int hci_req_sync(struct hci_dev *hdev,
+                       void (*req)(struct hci_dev *hdev, unsigned long opt),
+                       unsigned long opt, __u32 timeout)
 {
        int ret;
 
@@ -161,7 +161,7 @@ static int hci_request(struct hci_dev *hdev,
 
        /* Serialize all requests */
        hci_req_lock(hdev);
-       ret = __hci_request(hdev, req, opt, timeout);
+       ret = __hci_req_sync(hdev, req, opt, timeout);
        hci_req_unlock(hdev);
 
        return ret;
@@ -556,7 +556,8 @@ int hci_inquiry(void __user *arg)
        timeo = ir.length * msecs_to_jiffies(2000);
 
        if (do_inquiry) {
-               err = hci_request(hdev, hci_inq_req, (unsigned long)&ir, timeo);
+               err = hci_req_sync(hdev, hci_inq_req, (unsigned long) &ir,
+                                  timeo);
                if (err < 0)
                        goto done;
        }
@@ -737,7 +738,7 @@ int hci_dev_open(__u16 dev)
                set_bit(HCI_INIT, &hdev->flags);
                hdev->init_last_cmd = 0;
 
-               ret = __hci_request(hdev, hci_init_req, 0, HCI_INIT_TIMEOUT);
+               ret = __hci_req_sync(hdev, hci_init_req, 0, HCI_INIT_TIMEOUT);
 
                clear_bit(HCI_INIT, &hdev->flags);
        }
@@ -828,7 +829,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
        if (!test_bit(HCI_RAW, &hdev->flags) &&
            test_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks)) {
                set_bit(HCI_INIT, &hdev->flags);
-               __hci_request(hdev, hci_reset_req, 0, HCI_CMD_TIMEOUT);
+               __hci_req_sync(hdev, hci_reset_req, 0, HCI_CMD_TIMEOUT);
                clear_bit(HCI_INIT, &hdev->flags);
        }
 
@@ -921,7 +922,7 @@ int hci_dev_reset(__u16 dev)
        hdev->acl_cnt = 0; hdev->sco_cnt = 0; hdev->le_cnt = 0;
 
        if (!test_bit(HCI_RAW, &hdev->flags))
-               ret = __hci_request(hdev, hci_reset_req, 0, HCI_INIT_TIMEOUT);
+               ret = __hci_req_sync(hdev, hci_reset_req, 0, HCI_INIT_TIMEOUT);
 
 done:
        hci_req_unlock(hdev);
@@ -960,8 +961,8 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
 
        switch (cmd) {
        case HCISETAUTH:
-               err = hci_request(hdev, hci_auth_req, dr.dev_opt,
-                                 HCI_INIT_TIMEOUT);
+               err = hci_req_sync(hdev, hci_auth_req, dr.dev_opt,
+                                  HCI_INIT_TIMEOUT);
                break;
 
        case HCISETENCRYPT:
@@ -972,24 +973,24 @@ int hci_dev_cmd(unsigned int cmd, void __user *arg)
 
                if (!test_bit(HCI_AUTH, &hdev->flags)) {
                        /* Auth must be enabled first */
-                       err = hci_request(hdev, hci_auth_req, dr.dev_opt,
-                                         HCI_INIT_TIMEOUT);
+                       err = hci_req_sync(hdev, hci_auth_req, dr.dev_opt,
+                                          HCI_INIT_TIMEOUT);
                        if (err)
                                break;
                }
 
-               err = hci_request(hdev, hci_encrypt_req, dr.dev_opt,
-                                 HCI_INIT_TIMEOUT);
+               err = hci_req_sync(hdev, hci_encrypt_req, dr.dev_opt,
+                                  HCI_INIT_TIMEOUT);
                break;
 
        case HCISETSCAN:
-               err = hci_request(hdev, hci_scan_req, dr.dev_opt,
-                                 HCI_INIT_TIMEOUT);
+               err = hci_req_sync(hdev, hci_scan_req, dr.dev_opt,
+                                  HCI_INIT_TIMEOUT);
                break;
 
        case HCISETLINKPOL:
-               err = hci_request(hdev, hci_linkpol_req, dr.dev_opt,
-                                 HCI_INIT_TIMEOUT);
+               err = hci_req_sync(hdev, hci_linkpol_req, dr.dev_opt,
+                                  HCI_INIT_TIMEOUT);
                break;
 
        case HCISETLINKMODE:
@@ -1608,10 +1609,10 @@ static int hci_do_le_scan(struct hci_dev *hdev, u8 type, u16 interval,
 
        hci_req_lock(hdev);
 
-       err = __hci_request(hdev, le_scan_param_req, (unsigned long) &param,
-                           timeo);
+       err = __hci_req_sync(hdev, le_scan_param_req, (unsigned long) &param,
+                            timeo);
        if (!err)
-               err = __hci_request(hdev, le_scan_enable_req, 0, timeo);
+               err = __hci_req_sync(hdev, le_scan_enable_req, 0, timeo);
 
        hci_req_unlock(hdev);
 
@@ -2398,7 +2399,7 @@ static void hci_link_tx_to(struct hci_dev *hdev, __u8 type)
                if (c->type == type && c->sent) {
                        BT_ERR("%s killing stalled connection %pMR",
                               hdev->name, &c->dst);
-                       hci_acl_disconn(c, HCI_ERROR_REMOTE_USER_TERM);
+                       hci_disconnect(c, HCI_ERROR_REMOTE_USER_TERM);
                }
        }