Bluetooth: rename hci_conn_put to hci_conn_drop

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

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 0a2b128d2cc9a9629d81623e5f51c25bcf2b24c2..2cf28b198b31f5a83c41c3f46b4c7dd35da91801 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1190,7 +1190,7 @@ static void hci_cs_auth_requested(struct hci_dev *hdev, __u8 status)
        if (conn) {
                if (conn->state == BT_CONFIG) {
                        hci_proto_connect_cfm(conn, status);
-                       hci_conn_put(conn);
+                       hci_conn_drop(conn);
                }
        }
 
@@ -1217,7 +1217,7 @@ static void hci_cs_set_conn_encrypt(struct hci_dev *hdev, __u8 status)
        if (conn) {
                if (conn->state == BT_CONFIG) {
                        hci_proto_connect_cfm(conn, status);
-                       hci_conn_put(conn);
+                       hci_conn_drop(conn);
                }
        }
 
@@ -1379,7 +1379,7 @@ static void hci_cs_read_remote_features(struct hci_dev *hdev, __u8 status)
        if (conn) {
                if (conn->state == BT_CONFIG) {
                        hci_proto_connect_cfm(conn, status);
-                       hci_conn_put(conn);
+                       hci_conn_drop(conn);
                }
        }
 
@@ -1406,7 +1406,7 @@ static void hci_cs_read_remote_ext_features(struct hci_dev *hdev, __u8 status)
        if (conn) {
                if (conn->state == BT_CONFIG) {
                        hci_proto_connect_cfm(conn, status);
-                       hci_conn_put(conn);
+                       hci_conn_drop(conn);
                }
        }
 
@@ -1860,7 +1860,7 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
                } else {
                        conn->state = BT_CONNECT2;
                        hci_proto_connect_cfm(conn, 0);
-                       hci_conn_put(conn);
+                       hci_conn_drop(conn);
                }
        } else {
                /* Connection rejected */
@@ -1967,14 +1967,14 @@ static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
                } else {
                        conn->state = BT_CONNECTED;
                        hci_proto_connect_cfm(conn, ev->status);
-                       hci_conn_put(conn);
+                       hci_conn_drop(conn);
                }
        } else {
                hci_auth_cfm(conn, ev->status);
 
                hci_conn_hold(conn);
                conn->disc_timeout = HCI_DISCONN_TIMEOUT;
-               hci_conn_put(conn);
+               hci_conn_drop(conn);
        }
 
        if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags)) {
@@ -2058,7 +2058,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
 
                if (ev->status && conn->state == BT_CONNECTED) {
                        hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);
-                       hci_conn_put(conn);
+                       hci_conn_drop(conn);
                        goto unlock;
                }
 
@@ -2067,7 +2067,7 @@ static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
                                conn->state = BT_CONNECTED;
 
                        hci_proto_connect_cfm(conn, ev->status);
-                       hci_conn_put(conn);
+                       hci_conn_drop(conn);
                } else
                        hci_encrypt_cfm(conn, ev->status, ev->encrypt);
        }
@@ -2142,7 +2142,7 @@ static void hci_remote_features_evt(struct hci_dev *hdev,
        if (!hci_outgoing_auth_needed(hdev, conn)) {
                conn->state = BT_CONNECTED;
                hci_proto_connect_cfm(conn, ev->status);
-               hci_conn_put(conn);
+               hci_conn_drop(conn);
        }
 
 unlock:
@@ -2682,7 +2682,7 @@ static void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
        if (conn->state == BT_CONNECTED) {
                hci_conn_hold(conn);
                conn->disc_timeout = HCI_PAIRING_TIMEOUT;
-               hci_conn_put(conn);
+               hci_conn_drop(conn);
        }
 
        if (!test_bit(HCI_PAIRABLE, &hdev->dev_flags))
@@ -2785,7 +2785,7 @@ static void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb)
                if (ev->key_type != HCI_LK_CHANGED_COMBINATION)
                        conn->key_type = ev->key_type;
 
-               hci_conn_put(conn);
+               hci_conn_drop(conn);
        }
 
        if (test_bit(HCI_LINK_KEYS, &hdev->dev_flags))
@@ -2954,7 +2954,7 @@ static void hci_remote_ext_features_evt(struct hci_dev *hdev,
        if (!hci_outgoing_auth_needed(hdev, conn)) {
                conn->state = BT_CONNECTED;
                hci_proto_connect_cfm(conn, ev->status);
-               hci_conn_put(conn);
+               hci_conn_drop(conn);
        }
 
 unlock:
@@ -3087,7 +3087,7 @@ static void hci_key_refresh_complete_evt(struct hci_dev *hdev,
 
        if (ev->status && conn->state == BT_CONNECTED) {
                hci_disconnect(conn, HCI_ERROR_AUTH_FAILURE);
-               hci_conn_put(conn);
+               hci_conn_drop(conn);
                goto unlock;
        }
 
@@ -3096,13 +3096,13 @@ static void hci_key_refresh_complete_evt(struct hci_dev *hdev,
                        conn->state = BT_CONNECTED;
 
                hci_proto_connect_cfm(conn, ev->status);
-               hci_conn_put(conn);
+               hci_conn_drop(conn);
        } else {
                hci_auth_cfm(conn, ev->status);
 
                hci_conn_hold(conn);
                conn->disc_timeout = HCI_DISCONN_TIMEOUT;
-               hci_conn_put(conn);
+               hci_conn_drop(conn);
        }
 
 unlock:
@@ -3363,7 +3363,7 @@ static void hci_simple_pair_complete_evt(struct hci_dev *hdev,
                mgmt_auth_failed(hdev, &conn->dst, conn->type, conn->dst_type,
                                 ev->status);
 
-       hci_conn_put(conn);
+       hci_conn_drop(conn);
 
 unlock:
        hci_dev_unlock(hdev);
@@ -3451,7 +3451,7 @@ static void hci_phy_link_complete_evt(struct hci_dev *hdev,
 
        hci_conn_hold(hcon);
        hcon->disc_timeout = HCI_DISCONN_TIMEOUT;
-       hci_conn_put(hcon);
+       hci_conn_drop(hcon);
 
        hci_conn_hold_device(hcon);
        hci_conn_add_sysfs(hcon);