Merge android-4.4.185 (14e1196) into msm-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / net / bluetooth / hci_conn.c

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 114bcf6..211c259 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -141,7 +141,7 @@ static void le_scan_cleanup(struct work_struct *work)
        struct hci_dev *hdev = conn->hdev;
        struct hci_conn *c = NULL;
 
-       BT_DBG("%s hcon %p", hdev->name, conn);
+       BT_DBG("%s hcon %pK", hdev->name, conn);
 
        hci_dev_lock(hdev);
 
@@ -165,7 +165,7 @@ static void le_scan_cleanup(struct work_struct *work)
 
 static void hci_connect_le_scan_remove(struct hci_conn *conn)
 {
-       BT_DBG("%s hcon %p", conn->hdev->name, conn);
+       BT_DBG("%s hcon %pK", conn->hdev->name, conn);
 
        /* We can't call hci_conn_del/hci_conn_cleanup here since that
         * could deadlock with another hci_conn_del() call that's holding
@@ -187,7 +187,7 @@ static void hci_acl_create_connection(struct hci_conn *conn)
        struct inquiry_entry *ie;
        struct hci_cp_create_conn cp;
 
-       BT_DBG("hcon %p", conn);
+       BT_DBG("hcon %pK", conn);
 
        conn->state = BT_CONNECT;
        conn->out = true;
@@ -226,7 +226,7 @@ static void hci_acl_create_connection(struct hci_conn *conn)
 
 int hci_disconnect(struct hci_conn *conn, __u8 reason)
 {
-       BT_DBG("hcon %p", conn);
+       BT_DBG("hcon %pK", conn);
 
        /* When we are master of an established connection and it enters
         * the disconnect timeout, then go ahead and try to read the
@@ -251,7 +251,7 @@ static void hci_add_sco(struct hci_conn *conn, __u16 handle)
        struct hci_dev *hdev = conn->hdev;
        struct hci_cp_add_sco cp;
 
-       BT_DBG("hcon %p", conn);
+       BT_DBG("hcon %pK", conn);
 
        conn->state = BT_CONNECT;
        conn->out = true;
@@ -270,7 +270,7 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle)
        struct hci_cp_setup_sync_conn cp;
        const struct sco_param *param;
 
-       BT_DBG("hcon %p", conn);
+       BT_DBG("hcon %pK", conn);
 
        conn->state = BT_CONNECT;
        conn->out = true;
@@ -356,7 +356,7 @@ void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __le64 rand,
        struct hci_dev *hdev = conn->hdev;
        struct hci_cp_le_start_enc cp;
 
-       BT_DBG("hcon %p", conn);
+       BT_DBG("hcon %pK", conn);
 
        memset(&cp, 0, sizeof(cp));
 
@@ -376,7 +376,7 @@ void hci_sco_setup(struct hci_conn *conn, __u8 status)
        if (!sco)
                return;
 
-       BT_DBG("hcon %p", conn);
+       BT_DBG("hcon %pK", conn);
 
        if (!status) {
                if (lmp_esco_capable(conn->hdev))
@@ -395,7 +395,7 @@ static void hci_conn_timeout(struct work_struct *work)
                                             disc_work.work);
        int refcnt = atomic_read(&conn->refcnt);
 
-       BT_DBG("hcon %p state %s", conn, state_to_string(conn->state));
+       BT_DBG("hcon %pK state %s", conn, state_to_string(conn->state));
 
        WARN_ON(refcnt < 0);
 
@@ -426,7 +426,7 @@ static void hci_conn_idle(struct work_struct *work)
                                             idle_work.work);
        struct hci_dev *hdev = conn->hdev;
 
-       BT_DBG("hcon %p mode %d", conn, conn->mode);
+       BT_DBG("hcon %pK mode %d", conn, conn->mode);
 
        if (!lmp_sniff_capable(hdev) || !lmp_sniff_capable(conn))
                return;
@@ -566,7 +566,7 @@ int hci_conn_del(struct hci_conn *conn)
 {
        struct hci_dev *hdev = conn->hdev;
 
-       BT_DBG("%s hcon %p handle %d", hdev->name, conn, conn->handle);
+       BT_DBG("%s hcon %pK handle %d", hdev->name, conn, conn->handle);
 
        cancel_delayed_work_sync(&conn->disc_work);
        cancel_delayed_work_sync(&conn->auto_accept_work);
@@ -1160,7 +1160,7 @@ struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, bdaddr_t *dst,
 /* Check link security requirement */
 int hci_conn_check_link_mode(struct hci_conn *conn)
 {
-       BT_DBG("hcon %p", conn);
+       BT_DBG("hcon %pK", conn);
 
        /* In Secure Connections Only mode, it is required that Secure
         * Connections is used and the link is encrypted with AES-CCM
@@ -1183,7 +1183,7 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
 /* Authenticate remote device */
 static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
 {
-       BT_DBG("hcon %p", conn);
+       BT_DBG("hcon %pK", conn);
 
        if (conn->pending_sec_level > sec_level)
                sec_level = conn->pending_sec_level;
@@ -1220,7 +1220,7 @@ static int hci_conn_auth(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
 /* Encrypt the the link */
 static void hci_conn_encrypt(struct hci_conn *conn)
 {
-       BT_DBG("hcon %p", conn);
+       BT_DBG("hcon %pK", conn);
 
        if (!test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags)) {
                struct hci_cp_set_conn_encrypt cp;
@@ -1235,7 +1235,7 @@ static void hci_conn_encrypt(struct hci_conn *conn)
 int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type,
                      bool initiator)
 {
-       BT_DBG("hcon %p", conn);
+       BT_DBG("hcon %pK", conn);
 
        if (conn->type == LE_LINK)
                return smp_conn_security(conn, sec_level);
@@ -1312,7 +1312,7 @@ EXPORT_SYMBOL(hci_conn_security);
 /* Check secure link requirement */
 int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level)
 {
-       BT_DBG("hcon %p", conn);
+       BT_DBG("hcon %pK", conn);
 
        /* Accept if non-secure or higher security level is required */
        if (sec_level != BT_SECURITY_HIGH && sec_level != BT_SECURITY_FIPS)
@@ -1331,7 +1331,7 @@ EXPORT_SYMBOL(hci_conn_check_secure);
 /* Switch role */
 int hci_conn_switch_role(struct hci_conn *conn, __u8 role)
 {
-       BT_DBG("hcon %p", conn);
+       BT_DBG("hcon %pK", conn);
 
        if (role == conn->role)
                return 1;
@@ -1352,7 +1352,7 @@ void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active)
 {
        struct hci_dev *hdev = conn->hdev;
 
-       BT_DBG("hcon %p mode %d", conn, conn->mode);
+       BT_DBG("hcon %pK mode %d", conn, conn->mode);
 
        if (conn->mode != HCI_CM_SNIFF)
                goto timer;
@@ -1532,7 +1532,7 @@ struct hci_chan *hci_chan_create(struct hci_conn *conn)
        struct hci_dev *hdev = conn->hdev;
        struct hci_chan *chan;
 
-       BT_DBG("%s hcon %p", hdev->name, conn);
+       BT_DBG("%s hcon %pK", hdev->name, conn);
 
        if (test_bit(HCI_CONN_DROP, &conn->flags)) {
                BT_DBG("Refusing to create new hci_chan");
@@ -1557,7 +1557,7 @@ void hci_chan_del(struct hci_chan *chan)
        struct hci_conn *conn = chan->conn;
        struct hci_dev *hdev = conn->hdev;
 
-       BT_DBG("%s hcon %p chan %p", hdev->name, conn, chan);
+       BT_DBG("%s hcon %pK chan %pK", hdev->name, conn, chan);
 
        list_del_rcu(&chan->list);
 
@@ -1576,7 +1576,7 @@ void hci_chan_list_flush(struct hci_conn *conn)
 {
        struct hci_chan *chan, *n;
 
-       BT_DBG("hcon %p", conn);
+       BT_DBG("hcon %pK", conn);
 
        list_for_each_entry_safe(chan, n, &conn->chan_list, list)
                hci_chan_del(chan);