1 files changed, 3 insertions, 3 deletions

diff --git a/net/nfc/hci/hcp.c b/net/nfc/hci/hcp.c
index f4dad1a8974..bc308a7ca60 100644
--- a/net/nfc/hci/hcp.c
+++ b/net/nfc/hci/hcp.c
@@ -35,7 +35,7 @@
 int nfc_hci_hcp_message_tx(struct nfc_hci_dev *hdev, u8 pipe,
                            u8 type, u8 instruction,
                            const u8 *payload, size_t payload_len,
-                           hci_cmd_cb_t cb, void *cb_data,
+                           data_exchange_cb_t cb, void *cb_context,
                            unsigned long completion_delay)
 {
         struct nfc_dev *ndev = hdev->ndev;
@@ -52,7 +52,7 @@ int nfc_hci_hcp_message_tx(struct nfc_hci_dev *hdev, u8 pipe,
         skb_queue_head_init(&cmd->msg_frags);
         cmd->wait_response = (type == NFC_HCI_HCP_COMMAND) ? true : false;
         cmd->cb = cb;
-        cmd->cb_context = cb_data;
+        cmd->cb_context = cb_context;
         cmd->completion_delay = completion_delay;
 
         hci_len = payload_len + 1;
@@ -108,7 +108,7 @@ int nfc_hci_hcp_message_tx(struct nfc_hci_dev *hdev, u8 pipe,
         list_add_tail(&cmd->msg_l, &hdev->msg_tx_queue);
         mutex_unlock(&hdev->msg_tx_mutex);
 
-        queue_work(hdev->msg_tx_wq, &hdev->msg_tx_work);
+        schedule_work(&hdev->msg_tx_work);
 
         return 0;