Bluetooth: Replace BT_DBG with bt_dev_dbg in HCI request

This replaces the BT_DBG function to bt_dev_dbg as it is cleaner to show
the controller index in the debug message.

Signed-off-by: Howard Chung <howardchung@google.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index 6a74097..048d4db 100644 (file)
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -58,7 +58,7 @@ static int req_run(struct hci_request *req, hci_req_complete_t complete,
        struct sk_buff *skb;
        unsigned long flags;
 
-       BT_DBG("length %u", skb_queue_len(&req->cmd_q));
+       bt_dev_dbg(hdev, "length %u", skb_queue_len(&req->cmd_q));
 
        /* If an error occurred during request building, remove all HCI
         * commands queued on the HCI request queue.
@@ -102,7 +102,7 @@ int hci_req_run_skb(struct hci_request *req, hci_req_complete_skb_t complete)
 static void hci_req_sync_complete(struct hci_dev *hdev, u8 result, u16 opcode,
                                  struct sk_buff *skb)
 {
-       BT_DBG("%s result 0x%2.2x", hdev->name, result);
+       bt_dev_dbg(hdev, "result 0x%2.2x", result);
 
        if (hdev->req_status == HCI_REQ_PEND) {
                hdev->req_result = result;
@@ -115,7 +115,7 @@ static void hci_req_sync_complete(struct hci_dev *hdev, u8 result, u16 opcode,
 
 void hci_req_sync_cancel(struct hci_dev *hdev, int err)
 {
-       BT_DBG("%s err 0x%2.2x", hdev->name, err);
+       bt_dev_dbg(hdev, "err 0x%2.2x", err);
 
        if (hdev->req_status == HCI_REQ_PEND) {
                hdev->req_result = err;
@@ -131,7 +131,7 @@ struct sk_buff *__hci_cmd_sync_ev(struct hci_dev *hdev, u16 opcode, u32 plen,
        struct sk_buff *skb;
        int err = 0;
 
-       BT_DBG("%s", hdev->name);
+       bt_dev_dbg(hdev, "");
 
        hci_req_init(&req, hdev);
 
@@ -167,7 +167,7 @@ struct sk_buff *__hci_cmd_sync_ev(struct hci_dev *hdev, u16 opcode, u32 plen,
        skb = hdev->req_skb;
        hdev->req_skb = NULL;
 
-       BT_DBG("%s end: err %d", hdev->name, err);
+       bt_dev_dbg(hdev, "end: err %d", err);
 
        if (err < 0) {
                kfree_skb(skb);
@@ -196,7 +196,7 @@ int __hci_req_sync(struct hci_dev *hdev, int (*func)(struct hci_request *req,
        struct hci_request req;
        int err = 0;
 
-       BT_DBG("%s start", hdev->name);
+       bt_dev_dbg(hdev, "start");
 
        hci_req_init(&req, hdev);
 
@@ -260,7 +260,7 @@ int __hci_req_sync(struct hci_dev *hdev, int (*func)(struct hci_request *req,
        hdev->req_skb = NULL;
        hdev->req_status = hdev->req_result = 0;
 
-       BT_DBG("%s end: err %d", hdev->name, err);
+       bt_dev_dbg(hdev, "end: err %d", err);
 
        return err;
 }
@@ -300,7 +300,7 @@ struct sk_buff *hci_prepare_cmd(struct hci_dev *hdev, u16 opcode, u32 plen,
        if (plen)
                skb_put_data(skb, param, plen);
 
-       BT_DBG("skb len %d", skb->len);
+       bt_dev_dbg(hdev, "skb len %d", skb->len);
 
        hci_skb_pkt_type(skb) = HCI_COMMAND_PKT;
        hci_skb_opcode(skb) = opcode;
@@ -315,7 +315,7 @@ void hci_req_add_ev(struct hci_request *req, u16 opcode, u32 plen,
        struct hci_dev *hdev = req->hdev;
        struct sk_buff *skb;
 
-       BT_DBG("%s opcode 0x%4.4x plen %d", hdev->name, opcode, plen);
+       bt_dev_dbg(hdev, "opcode 0x%4.4x plen %d", opcode, plen);
 
        /* If an error occurred during request building, there is no point in
         * queueing the HCI command. We can simply return.
@@ -413,8 +413,8 @@ static void __hci_update_background_scan(struct hci_request *req)
         */
        hci_discovery_filter_clear(hdev);
 
-       BT_DBG("%s ADV monitoring is %s", hdev->name,
-              hci_is_adv_monitoring(hdev) ? "on" : "off");
+       bt_dev_dbg(hdev, "ADV monitoring is %s",
+                  hci_is_adv_monitoring(hdev) ? "on" : "off");
 
        if (list_empty(&hdev->pend_le_conns) &&
            list_empty(&hdev->pend_le_reports) &&
@@ -430,7 +430,7 @@ static void __hci_update_background_scan(struct hci_request *req)
 
                hci_req_add_le_scan_disable(req, false);
 
-               BT_DBG("%s stopping background scanning", hdev->name);
+               bt_dev_dbg(hdev, "stopping background scanning");
        } else {
                /* If there is at least one pending LE connection, we should
                 * keep the background scan running.
@@ -1826,7 +1826,7 @@ void hci_req_disable_address_resolution(struct hci_dev *hdev)
 
 static void adv_enable_complete(struct hci_dev *hdev, u8 status, u16 opcode)
 {
-       BT_DBG("%s status %u", hdev->name, status);
+       bt_dev_dbg(hdev, "status %u", status);
 }
 
 void hci_req_reenable_advertising(struct hci_dev *hdev)
@@ -1863,7 +1863,7 @@ static void adv_timeout_expire(struct work_struct *work)
        struct hci_request req;
        u8 instance;
 
-       BT_DBG("%s", hdev->name);
+       bt_dev_dbg(hdev, "");
 
        hci_dev_lock(hdev);
 
@@ -2347,7 +2347,7 @@ static void set_random_addr(struct hci_request *req, bdaddr_t *rpa)
         */
        if (hci_dev_test_flag(hdev, HCI_LE_ADV) ||
            hci_lookup_le_connect(hdev)) {
-               BT_DBG("Deferring random address update");
+               bt_dev_dbg(hdev, "Deferring random address update");
                hci_dev_set_flag(hdev, HCI_RPA_EXPIRED);
                return;
        }
@@ -2572,7 +2572,7 @@ void __hci_req_update_class(struct hci_request *req)
        struct hci_dev *hdev = req->hdev;
        u8 cod[3];
 
-       BT_DBG("%s", hdev->name);
+       bt_dev_dbg(hdev, "");
 
        if (!hdev_is_powered(hdev))
                return;
@@ -2741,7 +2741,7 @@ void __hci_abort_conn(struct hci_request *req, struct hci_conn *conn,
 static void abort_conn_complete(struct hci_dev *hdev, u8 status, u16 opcode)
 {
        if (status)
-               BT_DBG("Failed to abort connection: status 0x%2.2x", status);
+               bt_dev_dbg(hdev, "Failed to abort connection: status 0x%2.2x", status);
 }
 
 int hci_abort_conn(struct hci_conn *conn, u8 reason)
@@ -2804,7 +2804,7 @@ static int bredr_inquiry(struct hci_request *req, unsigned long opt)
        const u8 liac[3] = { 0x00, 0x8b, 0x9e };
        struct hci_cp_inquiry cp;
 
-       BT_DBG("%s", req->hdev->name);
+       bt_dev_dbg(req->hdev, "");
 
        hci_dev_lock(req->hdev);
        hci_inquiry_cache_flush(req->hdev);
@@ -2830,7 +2830,7 @@ static void le_scan_disable_work(struct work_struct *work)
                                            le_scan_disable.work);
        u8 status;
 
-       BT_DBG("%s", hdev->name);
+       bt_dev_dbg(hdev, "");
 
        if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))
                return;
@@ -2926,7 +2926,7 @@ static void le_scan_restart_work(struct work_struct *work)
        unsigned long timeout, duration, scan_start, now;
        u8 status;
 
-       BT_DBG("%s", hdev->name);
+       bt_dev_dbg(hdev, "");
 
        hci_req_sync(hdev, le_scan_restart, 0, HCI_CMD_TIMEOUT, &status);
        if (status) {
@@ -2980,7 +2980,7 @@ static int active_scan(struct hci_request *req, unsigned long opt)
        bool addr_resolv = false;
        int err;
 
-       BT_DBG("%s", hdev->name);
+       bt_dev_dbg(hdev, "");
 
        /* If controller is scanning, it means the background scanning is
         * running. Thus, we should temporarily stop it in order to set the
@@ -3008,7 +3008,7 @@ static int interleaved_discov(struct hci_request *req, unsigned long opt)
 {
        int err;
 
-       BT_DBG("%s", req->hdev->name);
+       bt_dev_dbg(req->hdev, "");
 
        err = active_scan(req, opt);
        if (err)
@@ -3021,7 +3021,7 @@ static void start_discovery(struct hci_dev *hdev, u8 *status)
 {
        unsigned long timeout;
 
-       BT_DBG("%s type %u", hdev->name, hdev->discovery.type);
+       bt_dev_dbg(hdev, "type %u", hdev->discovery.type);
 
        switch (hdev->discovery.type) {
        case DISCOV_TYPE_BREDR:
@@ -3069,7 +3069,7 @@ static void start_discovery(struct hci_dev *hdev, u8 *status)
        if (*status)
                return;
 
-       BT_DBG("%s timeout %u ms", hdev->name, jiffies_to_msecs(timeout));
+       bt_dev_dbg(hdev, "timeout %u ms", jiffies_to_msecs(timeout));
 
        /* When service discovery is used and the controller has a
         * strict duplicate filter, it is important to remember the
@@ -3094,7 +3094,7 @@ bool hci_req_stop_discovery(struct hci_request *req)
        struct inquiry_entry *e;
        bool ret = false;
 
-       BT_DBG("%s state %u", hdev->name, hdev->discovery.state);
+       bt_dev_dbg(hdev, "state %u", hdev->discovery.state);
 
        if (d->state == DISCOVERY_FINDING || d->state == DISCOVERY_STOPPING) {
                if (test_bit(HCI_INQUIRY, &hdev->flags))
@@ -3174,7 +3174,7 @@ static void discov_off(struct work_struct *work)
        struct hci_dev *hdev = container_of(work, struct hci_dev,
                                            discov_off.work);
 
-       BT_DBG("%s", hdev->name);
+       bt_dev_dbg(hdev, "");
 
        hci_dev_lock(hdev);