NFC: Cache the core NFC active target pointer instead of its index

The NFC Core now caches the active nfc target pointer, thereby avoiding
the need to lookup the target table for each invocation of a driver ops.
Consequently, pn533, HCI and NCI now directly receive an nfc_target
pointer instead of a target index.

Cc: Ilan Elias <ilane@ti.com>
Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 6 insertions, 30 deletions

diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index 86fd00d5a099..545c19f17536 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -520,50 +520,26 @@ static void hci_stop_poll(struct nfc_dev *nfc_dev)
         }
 }
 
-static struct nfc_target *hci_find_target(struct nfc_hci_dev *hdev,
-                                          u32 target_idx)
+static int hci_activate_target(struct nfc_dev *nfc_dev,
+                               struct nfc_target *target, u32 protocol)
 {
-        int i;
-        if (hdev->poll_started == false || hdev->targets == NULL)
-                return NULL;
-
-        for (i = 0; i < hdev->target_count; i++) {
-                if (hdev->targets[i].idx == target_idx)
-                        return &hdev->targets[i];
-        }
-
-        return NULL;
-}
-
-static int hci_activate_target(struct nfc_dev *nfc_dev, u32 target_idx,
-                               u32 protocol)
-{
-        struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
-
-        if (hci_find_target(hdev, target_idx) == NULL)
-                return -ENOMEDIUM;
-
         return 0;
 }
 
-static void hci_deactivate_target(struct nfc_dev *nfc_dev, u32 target_idx)
+static void hci_deactivate_target(struct nfc_dev *nfc_dev,
+                                  struct nfc_target *target)
 {
 }
 
-static int hci_data_exchange(struct nfc_dev *nfc_dev, u32 target_idx,
+static int hci_data_exchange(struct nfc_dev *nfc_dev, struct nfc_target *target,
                              struct sk_buff *skb, data_exchange_cb_t cb,
                              void *cb_context)
 {
         struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
         int r;
-        struct nfc_target *target;
         struct sk_buff *res_skb = NULL;
 
-        pr_debug("target_idx=%d\n", target_idx);
-
-        target = hci_find_target(hdev, target_idx);
-        if (target == NULL)
-                return -ENOMEDIUM;
+        pr_debug("target_idx=%d\n", target->idx);
 
         switch (target->hci_reader_gate) {
         case NFC_HCI_RF_READER_A_GATE: