summaryrefslogtreecommitdiff
path: root/net/nfc/hci/command.c
diff options
context:
space:
mode:
authorEric Lapuyade <eric.lapuyade@linux.intel.com>2012-09-11 12:41:41 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-25 02:17:25 +0400
commitb5faa648faf974b58e5a79eafa9a97e1deed7a8a (patch)
treed19b222e6dfb7cc9bfd0df675e583d7e9ec9db8f /net/nfc/hci/command.c
parentc1be211727467882e0485ab062e712a3c1fba840 (diff)
downloadlinux-b5faa648faf974b58e5a79eafa9a97e1deed7a8a.tar.xz
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 'net/nfc/hci/command.c')
-rw-r--r--net/nfc/hci/command.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/net/nfc/hci/command.c b/net/nfc/hci/command.c
index 46362ef979db..15e21093c7a5 100644
--- a/net/nfc/hci/command.c
+++ b/net/nfc/hci/command.c
@@ -28,10 +28,15 @@
#include "hci.h"
-static void nfc_hci_execute_cb(struct nfc_hci_dev *hdev, int err,
- struct sk_buff *skb, void *cb_data)
+/*
+ * HCI command execution completion callback.
+ * err will be a standard linux error (may be converted from HCI response)
+ * skb contains the response data and must be disposed, or may be NULL if
+ * an error occured
+ */
+static void nfc_hci_execute_cb(void *context, struct sk_buff *skb, int err)
{
- struct hcp_exec_waiter *hcp_ew = (struct hcp_exec_waiter *)cb_data;
+ struct hcp_exec_waiter *hcp_ew = (struct hcp_exec_waiter *)context;
pr_debug("HCI Cmd completed with result=%d\n", err);