NFC: hci: Remove nfc_hci_pipe2gate function

With the newly introduced pipes table hci_dev fields,
the nfc_hci_pipe2gate routine is no longer needed.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/net/nfc/hci/hci.h b/net/nfc/hci/hci.h
index c1278bd0fc5eb4a0c120f5d8856bfbc65e09190b..ab4c8e80b1ad57aadf1fa885601d94394517e34d 100644 (file)
--- a/net/nfc/hci/hci.h
+++ b/net/nfc/hci/hci.h
@@ -85,8 +85,6 @@ int nfc_hci_hcp_message_tx(struct nfc_hci_dev *hdev, u8 pipe,
                           data_exchange_cb_t cb, void *cb_context,
                           unsigned long completion_delay);
 
-u8 nfc_hci_pipe2gate(struct nfc_hci_dev *hdev, u8 pipe);
-
 void nfc_hci_hcp_message_rx(struct nfc_hci_dev *hdev, u8 pipe, u8 type,
                            u8 instruction, struct sk_buff *skb);
 

diff --git a/net/nfc/hci/hcp.c b/net/nfc/hci/hcp.c
index e9de1514656ecff2ff17253e65edc5c438a1cee0..1fe725d660852bb2422c94d37cc566e793a18464 100644 (file)
--- a/net/nfc/hci/hcp.c
+++ b/net/nfc/hci/hcp.c
@@ -124,17 +124,6 @@ out_skb_err:
        return err;
 }
 
-u8 nfc_hci_pipe2gate(struct nfc_hci_dev *hdev, u8 pipe)
-{
-       int gate;
-
-       for (gate = 0; gate < NFC_HCI_MAX_GATES; gate++)
-               if (hdev->gate2pipe[gate] == pipe)
-                       return gate;
-
-       return 0xff;
-}
-
 /*
  * Receive hcp message for pipe, with type and cmd.
  * skb contains optional message data only.