1 files changed, 9 insertions, 7 deletions

diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index 7f28d17dc792..abc0f3224dd1 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -336,8 +336,8 @@ void hci_req_add_ev(struct hci_request *req, u16 opcode, u32 plen,
 
         skb = hci_prepare_cmd(hdev, opcode, plen, param);
         if (!skb) {
-                BT_ERR("%s no memory for command (opcode 0x%4.4x)",
-                       hdev->name, opcode);
+                bt_dev_err(hdev, "no memory for command (opcode 0x%4.4x)",
+                           opcode);
                 req->err = -ENOMEM;
                 return;
         }
@@ -1426,7 +1426,7 @@ int hci_update_random_address(struct hci_request *req, bool require_privacy,
 
                 err = smp_generate_rpa(hdev, hdev->irk, &hdev->rpa);
                 if (err < 0) {
-                        BT_ERR("%s failed to generate new RPA", hdev->name);
+                        bt_dev_err(hdev, "failed to generate new RPA");
                         return err;
                 }
 
@@ -1788,7 +1788,7 @@ int hci_abort_conn(struct hci_conn *conn, u8 reason)
 
         err = hci_req_run(&req, abort_conn_complete);
         if (err && err != -ENODATA) {
-                BT_ERR("Failed to run HCI request: err %d", err);
+                bt_dev_err(conn->hdev, "failed to run HCI request: err %d", err);
                 return err;
         }
 
@@ -1872,7 +1872,8 @@ static void le_scan_disable_work(struct work_struct *work)
 
         hci_req_sync(hdev, le_scan_disable, 0, HCI_CMD_TIMEOUT, &status);
         if (status) {
-                BT_ERR("Failed to disable LE scan: status 0x%02x", status);
+                bt_dev_err(hdev, "failed to disable LE scan: status 0x%02x",
+                           status);
                 return;
         }
 
@@ -1903,7 +1904,7 @@ static void le_scan_disable_work(struct work_struct *work)
         hci_req_sync(hdev, bredr_inquiry, DISCOV_INTERLEAVED_INQUIRY_LEN,
                      HCI_CMD_TIMEOUT, &status);
         if (status) {
-                BT_ERR("Inquiry failed: status 0x%02x", status);
+                bt_dev_err(hdev, "inquiry failed: status 0x%02x", status);
                 goto discov_stopped;
         }
 
@@ -1945,7 +1946,8 @@ static void le_scan_restart_work(struct work_struct *work)
 
         hci_req_sync(hdev, le_scan_restart, 0, HCI_CMD_TIMEOUT, &status);
         if (status) {
-                BT_ERR("Failed to restart LE scan: status %d", status);
+                bt_dev_err(hdev, "failed to restart LE scan: status %d",
+                           status);
                 return;
         }