NFC: Changed HCI cmd execution completion result to std linux errno

An HCI command can complete either from an HCI response
(with an HCI result) or as a consequence of any other system
error during processing. The completion therefore needs to take
a standard errno code. The HCI response will convert its result
to a standard errno before calling the completion.

Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

3 files changed, 23 insertions, 22 deletions

diff --git a/net/nfc/hci/command.c b/net/nfc/hci/command.c
index 8729abf5f18b..12cd6f3f77ec 100644
--- a/net/nfc/hci/command.c
+++ b/net/nfc/hci/command.c
@@ -28,26 +28,14 @@
 
 #include "hci.h"
 
-static int nfc_hci_result_to_errno(u8 result)
-{
-        switch (result) {
-        case NFC_HCI_ANY_OK:
-                return 0;
-        case NFC_HCI_ANY_E_TIMEOUT:
-                return -ETIMEDOUT;
-        default:
-                return -1;
-        }
-}
-
-static void nfc_hci_execute_cb(struct nfc_hci_dev *hdev, u8 result,
+static void nfc_hci_execute_cb(struct nfc_hci_dev *hdev, int err,
                                struct sk_buff *skb, void *cb_data)
 {
         struct hcp_exec_waiter *hcp_ew = (struct hcp_exec_waiter *)cb_data;
 
-        pr_debug("HCI Cmd completed with HCI result=%d\n", result);
+        pr_debug("HCI Cmd completed with result=%d\n", err);
 
-        hcp_ew->exec_result = nfc_hci_result_to_errno(result);
+        hcp_ew->exec_result = err;
         if (hcp_ew->exec_result == 0)
                 hcp_ew->result_skb = skb;
         else
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index 7d4fdbc06a98..5be7405ce6aa 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -32,6 +32,18 @@
 /* Largest headroom needed for outgoing HCI commands */
 #define HCI_CMDS_HEADROOM 1
 
+static int nfc_hci_result_to_errno(u8 result)
+{
+        switch (result) {
+        case NFC_HCI_ANY_OK:
+                return 0;
+        case NFC_HCI_ANY_E_TIMEOUT:
+                return -ETIME;
+        default:
+                return -1;
+        }
+}
+
 static void nfc_hci_msg_tx_work(struct work_struct *work)
 {
         struct nfc_hci_dev *hdev = container_of(work, struct nfc_hci_dev,
@@ -46,7 +58,7 @@ static void nfc_hci_msg_tx_work(struct work_struct *work)
                 if (timer_pending(&hdev->cmd_timer) == 0) {
                         if (hdev->cmd_pending_msg->cb)
                                 hdev->cmd_pending_msg->cb(hdev,
-                                                          NFC_HCI_ANY_E_TIMEOUT,
+                                                          -ETIME,
                                                           NULL,
                                                           hdev->
                                                           cmd_pending_msg->
@@ -71,8 +83,7 @@ next_msg:
                         kfree_skb(skb);
                         skb_queue_purge(&msg->msg_frags);
                         if (msg->cb)
-                                msg->cb(hdev, NFC_HCI_ANY_E_NOK, NULL,
-                                        msg->cb_context);
+                                msg->cb(hdev, r, NULL, msg->cb_context);
                         kfree(msg);
                         break;
                 }
@@ -129,7 +140,8 @@ void nfc_hci_resp_received(struct nfc_hci_dev *hdev, u8 result,
         del_timer_sync(&hdev->cmd_timer);
 
         if (hdev->cmd_pending_msg->cb)
-                hdev->cmd_pending_msg->cb(hdev, result, skb,
+                hdev->cmd_pending_msg->cb(hdev, nfc_hci_result_to_errno(result),
+                                          skb,
                                           hdev->cmd_pending_msg->cb_context);
         else
                 kfree_skb(skb);
diff --git a/net/nfc/hci/hci.h b/net/nfc/hci/hci.h
index 45f2fe4fd486..d3cde075ba60 100644
--- a/net/nfc/hci/hci.h
+++ b/net/nfc/hci/hci.h
@@ -37,10 +37,11 @@ struct hcp_packet {
 
 /*
  * HCI command execution completion callback.
- * result will be one of the HCI response codes.
- * skb contains the response data and must be disposed.
+ * result 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
  */
-typedef void (*hci_cmd_cb_t) (struct nfc_hci_dev *hdev, u8 result,
+typedef void (*hci_cmd_cb_t) (struct nfc_hci_dev *hdev, int result,
                               struct sk_buff *skb, void *cb_data);
 
 struct hcp_exec_waiter {