diff options
Diffstat (limited to 'net/nfc')
-rw-r--r-- | net/nfc/core.c | 2 | ||||
-rw-r--r-- | net/nfc/hci/core.c | 3 | ||||
-rw-r--r-- | net/nfc/nci/core.c | 2 | ||||
-rw-r--r-- | net/nfc/nci/spi.c | 3 | ||||
-rw-r--r-- | net/nfc/netlink.c | 1 |
5 files changed, 2 insertions, 9 deletions
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 | */ |
833 | struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops, | 833 | struct 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 | */ |
659 | struct nci_dev *nci_allocate_device(struct nci_ops *ops, | 659 | struct 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; |