aboutsummaryrefslogtreecommitdiffstats
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
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
-rw-r--r--drivers/nfc/microread/microread.c6
-rw-r--r--drivers/nfc/nfcwilink.c1
-rw-r--r--drivers/nfc/pn533.c1
-rw-r--r--drivers/nfc/pn544/pn544.c6
-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
-rw-r--r--net/nfc/core.c2
-rw-r--r--net/nfc/hci/core.c3
-rw-r--r--net/nfc/nci/core.c2
-rw-r--r--net/nfc/nci/spi.c3
-rw-r--r--net/nfc/netlink.c1
12 files changed, 6 insertions, 23 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 +
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)
535 535
536 drv->ndev = nci_allocate_device(&nfcwilink_ops, 536 drv->ndev = nci_allocate_device(&nfcwilink_ops,
537 protocols, 537 protocols,
538 NFC_SE_NONE,
539 NFCWILINK_HDR_LEN, 538 NFCWILINK_HDR_LEN,
540 0); 539 0);
541 if (!drv->ndev) { 540 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,
2791 2791
2792 2792
2793 dev->nfc_dev = nfc_allocate_device(&pn533_nfc_ops, protocols, 2793 dev->nfc_dev = nfc_allocate_device(&pn533_nfc_ops, protocols,
2794 NFC_SE_NONE,
2795 dev->ops->tx_header_len + 2794 dev->ops->tx_header_len +
2796 PN533_CMD_DATAEXCH_HEAD_LEN, 2795 PN533_CMD_DATAEXCH_HEAD_LEN,
2797 dev->ops->tx_tail_len); 2796 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,
803 struct nfc_hci_dev **hdev) 803 struct nfc_hci_dev **hdev)
804{ 804{
805 struct pn544_hci_info *info; 805 struct pn544_hci_info *info;
806 u32 protocols, se; 806 u32 protocols;
807 struct nfc_hci_init_data init_data; 807 struct nfc_hci_init_data init_data;
808 int r; 808 int r;
809 809
@@ -836,10 +836,8 @@ int pn544_hci_probe(void *phy_id, struct nfc_phy_ops *phy_ops, char *llc_name,
836 NFC_PROTO_ISO14443_B_MASK | 836 NFC_PROTO_ISO14443_B_MASK |
837 NFC_PROTO_NFC_DEP_MASK; 837 NFC_PROTO_NFC_DEP_MASK;
838 838
839 se = NFC_SE_UICC | NFC_SE_EMBEDDED;
840
841 info->hdev = nfc_hci_allocate_device(&pn544_hci_ops, &init_data, 0, 839 info->hdev = nfc_hci_allocate_device(&pn544_hci_ops, &init_data, 0,
842 protocols, se, llc_name, 840 protocols, llc_name,
843 phy_headroom + PN544_CMDS_HEADROOM, 841 phy_headroom + PN544_CMDS_HEADROOM,
844 phy_tailroom, phy_payload); 842 phy_tailroom, phy_payload);
845 if (!info->hdev) { 843 if (!info->hdev) {
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
diff --git a/net/nfc/core.c b/net/nfc/core.c
index eb3cecf1764e..334954a1d6e8 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -832,7 +832,6 @@ struct nfc_dev *nfc_get_device(unsigned int idx)
832 */ 832 */
833struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops, 833struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
834 u32 supported_protocols, 834 u32 supported_protocols,
835 u32 supported_se,
836 int tx_headroom, int tx_tailroom) 835 int tx_headroom, int tx_tailroom)
837{ 836{
838 struct nfc_dev *dev; 837 struct nfc_dev *dev;
@@ -850,7 +849,6 @@ struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
850 849
851 dev->ops = ops; 850 dev->ops = ops;
852 dev->supported_protocols = supported_protocols; 851 dev->supported_protocols = supported_protocols;
853 dev->supported_se = supported_se;
854 dev->active_se = NFC_SE_NONE; 852 dev->active_se = NFC_SE_NONE;
855 dev->tx_headroom = tx_headroom; 853 dev->tx_headroom = tx_headroom;
856 dev->tx_tailroom = tx_tailroom; 854 dev->tx_tailroom = tx_tailroom;
diff --git a/net/nfc/hci/core.c b/net/nfc/hci/core.c
index d2ef1e2ee0c6..9c8a63d341d3 100644
--- a/net/nfc/hci/core.c
+++ b/net/nfc/hci/core.c
@@ -808,7 +808,6 @@ struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,
808 struct nfc_hci_init_data *init_data, 808 struct nfc_hci_init_data *init_data,
809 unsigned long quirks, 809 unsigned long quirks,
810 u32 protocols, 810 u32 protocols,
811 u32 supported_se,
812 const char *llc_name, 811 const char *llc_name,
813 int tx_headroom, 812 int tx_headroom,
814 int tx_tailroom, 813 int tx_tailroom,
@@ -834,7 +833,7 @@ struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,
834 return NULL; 833 return NULL;
835 } 834 }
836 835
837 hdev->ndev = nfc_allocate_device(&hci_nfc_ops, protocols, supported_se, 836 hdev->ndev = nfc_allocate_device(&hci_nfc_ops, protocols,
838 tx_headroom + HCI_CMDS_HEADROOM, 837 tx_headroom + HCI_CMDS_HEADROOM,
839 tx_tailroom); 838 tx_tailroom);
840 if (!hdev->ndev) { 839 if (!hdev->ndev) {
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 8e0dbbeee9e3..145bad15e113 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -658,7 +658,6 @@ static struct nfc_ops nci_nfc_ops = {
658 */ 658 */
659struct nci_dev *nci_allocate_device(struct nci_ops *ops, 659struct nci_dev *nci_allocate_device(struct nci_ops *ops,
660 __u32 supported_protocols, 660 __u32 supported_protocols,
661 __u32 supported_se,
662 int tx_headroom, int tx_tailroom) 661 int tx_headroom, int tx_tailroom)
663{ 662{
664 struct nci_dev *ndev; 663 struct nci_dev *ndev;
@@ -681,7 +680,6 @@ struct nci_dev *nci_allocate_device(struct nci_ops *ops,
681 680
682 ndev->nfc_dev = nfc_allocate_device(&nci_nfc_ops, 681 ndev->nfc_dev = nfc_allocate_device(&nci_nfc_ops,
683 supported_protocols, 682 supported_protocols,
684 supported_se,
685 tx_headroom + NCI_DATA_HDR_SIZE, 683 tx_headroom + NCI_DATA_HDR_SIZE,
686 tx_tailroom); 684 tx_tailroom);
687 if (!ndev->nfc_dev) 685 if (!ndev->nfc_dev)
diff --git a/net/nfc/nci/spi.c b/net/nfc/nci/spi.c
index 70afc387a965..c7cf37ba7298 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,
162 tailroom += NCI_SPI_CRC_LEN; 162 tailroom += NCI_SPI_CRC_LEN;
163 163
164 ndev->nci_dev = nci_allocate_device(&nci_spi_ops, supported_protocols, 164 ndev->nci_dev = nci_allocate_device(&nci_spi_ops, supported_protocols,
165 supported_se, NCI_SPI_HDR_LEN, 165 NCI_SPI_HDR_LEN, tailroom);
166 tailroom);
167 if (!ndev->nci_dev) 166 if (!ndev->nci_dev)
168 return NULL; 167 return NULL;
169 168
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 1deadad9a285..fdbc662c564a 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -444,7 +444,6 @@ static int nfc_genl_send_device(struct sk_buff *msg, struct nfc_dev *dev,
444 if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)) || 444 if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)) ||
445 nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) || 445 nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx) ||
446 nla_put_u32(msg, NFC_ATTR_PROTOCOLS, dev->supported_protocols) || 446 nla_put_u32(msg, NFC_ATTR_PROTOCOLS, dev->supported_protocols) ||
447 nla_put_u32(msg, NFC_ATTR_SE, dev->supported_se) ||
448 nla_put_u8(msg, NFC_ATTR_DEVICE_POWERED, dev->dev_up) || 447 nla_put_u8(msg, NFC_ATTR_DEVICE_POWERED, dev->dev_up) ||
449 nla_put_u8(msg, NFC_ATTR_RF_MODE, dev->rf_mode)) 448 nla_put_u8(msg, NFC_ATTR_RF_MODE, dev->rf_mode))
450 goto nla_put_failure; 449 goto nla_put_failure;
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-29 23:29:41 -0400