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>

4 files changed, 4 insertions, 10 deletions

diff --git a/drivers/nfc/microread/microread.c b/drivers/nfc/microread/microread.c
index 3420d833db17..cdb9f6de132a 100644
--- a/drivers/nfc/microread/microread.c
+++ b/drivers/nfc/microread/microread.c
@@ -650,7 +650,7 @@ int microread_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name,
 {
         struct microread_info *info;
         unsigned long quirks = 0;
-        u32 protocols, se;
+        u32 protocols;
         struct nfc_hci_init_data init_data;
         int r;
 
@@ -678,10 +678,8 @@ int microread_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name,
                     NFC_PROTO_ISO14443_B_MASK |
                     NFC_PROTO_NFC_DEP_MASK;
 
-        se = NFC_SE_UICC | NFC_SE_EMBEDDED;
-
         info->hdev = nfc_hci_allocate_device(&microread_hci_ops, &init_data,
-                                             quirks, protocols, se, llc_name,
+                                             quirks, protocols, llc_name,
                                              phy_headroom +
                                              MICROREAD_CMDS_HEADROOM,
                                              phy_tailroom +
diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
index 41cf8f70a6ad..59f95d8fc98c 100644
--- a/drivers/nfc/nfcwilink.c
+++ b/drivers/nfc/nfcwilink.c
@@ -535,7 +535,6 @@ static int nfcwilink_probe(struct platform_device *pdev)
 
         drv->ndev = nci_allocate_device(&nfcwilink_ops,
                                         protocols,
-                                        NFC_SE_NONE,
                                         NFCWILINK_HDR_LEN,
                                         0);
         if (!drv->ndev) {
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index e196bdfcfc30..a1b46aa7b4d5 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -2791,7 +2791,6 @@ static int pn533_probe(struct usb_interface *interface,
 
 
         dev->nfc_dev = nfc_allocate_device(&pn533_nfc_ops, protocols,
-                                           NFC_SE_NONE,
                                            dev->ops->tx_header_len +
                                            PN533_CMD_DATAEXCH_HEAD_LEN,
                                            dev->ops->tx_tail_len);
diff --git a/drivers/nfc/pn544/pn544.c b/drivers/nfc/pn544/pn544.c
index 84b5168b603c..0d17da7675b7 100644
--- a/drivers/nfc/pn544/pn544.c
+++ b/drivers/nfc/pn544/pn544.c
@@ -803,7 +803,7 @@ int pn544_hci_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name,
                     struct nfc_hci_dev **hdev)
 {
         struct pn544_hci_info *info;
-        u32 protocols, se;
+        u32 protocols;
         struct nfc_hci_init_data init_data;
         int r;
 
@@ -836,10 +836,8 @@ int pn544_hci_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name,
                     NFC_PROTO_ISO14443_B_MASK |
                     NFC_PROTO_NFC_DEP_MASK;
 
-        se = NFC_SE_UICC | NFC_SE_EMBEDDED;
-
         info->hdev = nfc_hci_allocate_device(&pn544_hci_ops, &init_data, 0,
-                                             protocols, se, llc_name,
+                                             protocols, llc_name,
                                              phy_headroom + PN544_CMDS_HEADROOM,
                                              phy_tailroom, phy_payload);
         if (!info->hdev) {