Commit ec14b6c9 authored Jan 27, 2015 by Christophe Ricard Committed by Samuel Ortiz Jan 28, 2015

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>

parent d6365c01

net/nfc/hci/hci.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);

net/nfc/hci/hcp.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -124,17 +124,6 @@ int nfc_hci_hcp_message_tx(struct nfc_hci_dev *hdev, u8 pipe,
		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.