aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-05-07 13:22:11 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-06-14 07:44:19 -0400
commit0b456c418a5595b9d67f300c9ac6a2441e774603 (patch)
tree3a995c4573c1cd6e7fd0582e9b233ab4b40f5817 /include
parent322bce957e9b0e30ef7147dae0414ad8f3f558c8 (diff)
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 'include')
-rw-r--r--include/net/nfc/hci.h1
-rw-r--r--include/net/nfc/nci_core.h1
-rw-r--r--include/net/nfc/nfc.h2
3 files changed, 0 insertions, 4 deletions
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h
index 14faf2dc7a48..eca8846a63d6 100644
--- a/include/net/nfc/hci.h
+++ b/include/net/nfc/hci.h
@@ -153,7 +153,6 @@ struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,
153 struct nfc_hci_init_data *init_data, 153 struct nfc_hci_init_data *init_data,
154 unsigned long quirks, 154 unsigned long quirks,
155 u32 protocols, 155 u32 protocols,
156 u32 supported_se,
157 const char *llc_name, 156 const char *llc_name,
158 int tx_headroom, 157 int tx_headroom,
159 int tx_tailroom, 158 int tx_tailroom,
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
index fc1296db237b..99fc1f3a392a 100644
--- a/include/net/nfc/nci_core.h
+++ b/include/net/nfc/nci_core.h
@@ -148,7 +148,6 @@ struct nci_dev {
148/* ----- NCI Devices ----- */ 148/* ----- NCI Devices ----- */
149struct nci_dev *nci_allocate_device(struct nci_ops *ops, 149struct nci_dev *nci_allocate_device(struct nci_ops *ops,
150 __u32 supported_protocols, 150 __u32 supported_protocols,
151 __u32 supported_se,
152 int tx_headroom, 151 int tx_headroom,
153 int tx_tailroom); 152 int tx_tailroom);
154void nci_free_device(struct nci_dev *ndev); 153void nci_free_device(struct nci_dev *ndev);
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h
index 8fc1784a264d..9900c0f5d6bd 100644
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
@@ -115,7 +115,6 @@ struct nfc_dev {
115 struct nfc_genl_data genl_data; 115 struct nfc_genl_data genl_data;
116 u32 supported_protocols; 116 u32 supported_protocols;
117 117
118 u32 supported_se;
119 u32 active_se; 118 u32 active_se;
120 119
121 int tx_headroom; 120 int tx_headroom;
@@ -136,7 +135,6 @@ extern struct class nfc_class;
136 135
137struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops, 136struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
138 u32 supported_protocols, 137 u32 supported_protocols,
139 u32 supported_se,
140 int tx_headroom, 138 int tx_headroom,
141 int tx_tailroom); 139 int tx_tailroom);
142 140