diff options
author | Eric Lapuyade <eric.lapuyade@linux.intel.com> | 2012-09-11 10:41:41 +0200 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-09-25 00:17:25 +0200 |
commit | b5faa648faf974b58e5a79eafa9a97e1deed7a8a (patch) | |
tree | d19b222e6dfb7cc9bfd0df675e583d7e9ec9db8f /net/nfc/hci/hcp.c | |
parent | NFC: Correct outgoing frame before requeueing (diff) | |
download | linux-b5faa648faf974b58e5a79eafa9a97e1deed7a8a.tar.xz linux-b5faa648faf974b58e5a79eafa9a97e1deed7a8a.zip |
NFC: Changed the HCI cmd execution callback prototype
Make it match the data_exchange_cb_t so that it can be used directly in
the implementation of an asynchronous hci_transceive
Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to '')
-rw-r--r-- | net/nfc/hci/hcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/hci/hcp.c b/net/nfc/hci/hcp.c index 2372b558abe9..208eedd07ee3 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; |