diff options
author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-01-26 19:18:18 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-01-27 18:03:36 -0500 |
commit | ec14b6c93c2f804f302b8ea1736539d39b9c544b (patch) | |
tree | 975f7fc565a1811e143f6294271ff4501390820a /net/nfc | |
parent | d6365c018b3f9e12eeb262407ccf5b143bcc6bad (diff) |
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>
Diffstat (limited to 'net/nfc')
-rw-r--r-- | net/nfc/hci/hci.h | 2 | ||||
-rw-r--r-- | net/nfc/hci/hcp.c | 11 |
2 files changed, 0 insertions, 13 deletions
diff --git a/net/nfc/hci/hci.h b/net/nfc/hci/hci.h index c1278bd0fc5e..ab4c8e80b1ad 100644 --- 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, | |||
85 | data_exchange_cb_t cb, void *cb_context, | 85 | data_exchange_cb_t cb, void *cb_context, |
86 | unsigned long completion_delay); | 86 | unsigned long completion_delay); |
87 | 87 | ||
88 | u8 nfc_hci_pipe2gate(struct nfc_hci_dev *hdev, u8 pipe); | ||
89 | |||
90 | void nfc_hci_hcp_message_rx(struct nfc_hci_dev *hdev, u8 pipe, u8 type, | 88 | void nfc_hci_hcp_message_rx(struct nfc_hci_dev *hdev, u8 pipe, u8 type, |
91 | u8 instruction, struct sk_buff *skb); | 89 | u8 instruction, struct sk_buff *skb); |
92 | 90 | ||
diff --git a/net/nfc/hci/hcp.c b/net/nfc/hci/hcp.c index e9de1514656e..1fe725d66085 100644 --- a/net/nfc/hci/hcp.c +++ b/net/nfc/hci/hcp.c | |||
@@ -124,17 +124,6 @@ out_skb_err: | |||
124 | return err; | 124 | return err; |
125 | } | 125 | } |
126 | 126 | ||
127 | u8 nfc_hci_pipe2gate(struct nfc_hci_dev *hdev, u8 pipe) | ||
128 | { | ||
129 | int gate; | ||
130 | |||
131 | for (gate = 0; gate < NFC_HCI_MAX_GATES; gate++) | ||
132 | if (hdev->gate2pipe[gate] == pipe) | ||
133 | return gate; | ||
134 | |||
135 | return 0xff; | ||
136 | } | ||
137 | |||
138 | /* | 127 | /* |
139 | * Receive hcp message for pipe, with type and cmd. | 128 | * Receive hcp message for pipe, with type and cmd. |
140 | * skb contains optional message data only. | 129 | * skb contains optional message data only. |