aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nfc/microread
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 /drivers/nfc/microread
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 'drivers/nfc/microread')
-rw-r--r--drivers/nfc/microread/microread.c6
1 files changed, 2 insertions, 4 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,
650{ 650{
651 struct microread_info *info; 651 struct microread_info *info;
652 unsigned long quirks = 0; 652 unsigned long quirks = 0;
653 u32 protocols, se; 653 u32 protocols;
654 struct nfc_hci_init_data init_data; 654 struct nfc_hci_init_data init_data;
655 int r; 655 int r;
656 656
@@ -678,10 +678,8 @@ int microread_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name,
678 NFC_PROTO_ISO14443_B_MASK | 678 NFC_PROTO_ISO14443_B_MASK |
679 NFC_PROTO_NFC_DEP_MASK; 679 NFC_PROTO_NFC_DEP_MASK;
680 680
681 se = NFC_SE_UICC | NFC_SE_EMBEDDED;
682
683 info->hdev = nfc_hci_allocate_device(&microread_hci_ops, &init_data, 681 info->hdev = nfc_hci_allocate_device(&microread_hci_ops, &init_data,
684 quirks, protocols, se, llc_name, 682 quirks, protocols, llc_name,
685 phy_headroom + 683 phy_headroom +
686 MICROREAD_CMDS_HEADROOM, 684 MICROREAD_CMDS_HEADROOM,
687 phy_tailroom + 685 phy_tailroom +