summaryrefslogtreecommitdiffstats
path: root/net/nfc/nci
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-05-07 19:22:11 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-06-14 13:44:19 +0200
commit0b456c418a5595b9d67f300c9ac6a2441e774603 (patch)
tree3a995c4573c1cd6e7fd0582e9b233ab4b40f5817 /net/nfc/nci
parent322bce957e9b0e30ef7147dae0414ad8f3f558c8 (diff)
downloadop-kernel-dev-0b456c418a5595b9d67f300c9ac6a2441e774603.zip
op-kernel-dev-0b456c418a5595b9d67f300c9ac6a2441e774603.tar.gz
NFC: Remove the static supported_se field
Supported secure elements are typically found during a discovery process initiated when the NFC controller is up and running. For a given NFC chipset there can be many configurations (embedded SE or not, with or without a SIM card wired to the NFC controller SWP interface, etc...) and thus driver code will never know before hand which SEs are available. So we remove this field, it will be replaced by a real SE discovery mechanism. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/nci')
-rw-r--r--net/nfc/nci/core.c2
-rw-r--r--net/nfc/nci/spi.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 8e0dbbe..145bad1 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -658,7 +658,6 @@ static struct nfc_ops nci_nfc_ops = {
*/
struct nci_dev *nci_allocate_device(struct nci_ops *ops,
__u32 supported_protocols,
- __u32 supported_se,
int tx_headroom, int tx_tailroom)
{
struct nci_dev *ndev;
@@ -681,7 +680,6 @@ struct nci_dev *nci_allocate_device(struct nci_ops *ops,
ndev->nfc_dev = nfc_allocate_device(&nci_nfc_ops,
supported_protocols,
- supported_se,
tx_headroom + NCI_DATA_HDR_SIZE,
tx_tailroom);
if (!ndev->nfc_dev)
diff --git a/net/nfc/nci/spi.c b/net/nfc/nci/spi.c
index 70afc38..c7cf37b 100644
--- a/net/nfc/nci/spi.c
+++ b/net/nfc/nci/spi.c
@@ -162,8 +162,7 @@ struct nci_spi_dev *nci_spi_allocate_device(struct spi_device *spi,
tailroom += NCI_SPI_CRC_LEN;
ndev->nci_dev = nci_allocate_device(&nci_spi_ops, supported_protocols,
- supported_se, NCI_SPI_HDR_LEN,
- tailroom);
+ NCI_SPI_HDR_LEN, tailroom);
if (!ndev->nci_dev)
return NULL;
OpenPOWER on IntegriCloud