NFC: Remove useless HCI private nfc target table
authorEric Lapuyade <eric.lapuyade@intel.com>
Mon, 7 May 2012 10:31:14 +0000 (12:31 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 15 May 2012 21:28:00 +0000 (17:28 -0400)
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>
include/net/nfc/hci.h
net/nfc/hci/core.c

index aca65a5..95fc0c2 100644 (file)
@@ -83,8 +83,6 @@ struct nfc_hci_dev {
        u8 gate2pipe[NFC_HCI_MAX_GATES];
 
        bool poll_started;
-       struct nfc_target *targets;
-       int target_count;
 
        u8 sw_romlib;
        u8 sw_patch;
index 545c19f..ef5cd5c 100644 (file)
@@ -235,13 +235,6 @@ static int nfc_hci_target_discovered(struct nfc_hci_dev *hdev, u8 gate)
        targets->hci_reader_gate = gate;
 
        r = nfc_targets_found(hdev->ndev, targets, 1);
-       if (r < 0)
-               goto exit;
-
-       kfree(hdev->targets);
-       hdev->targets = targets;
-       targets = NULL;
-       hdev->target_count = 1;
 
 exit:
        kfree(targets);