diff options
author | Christophe Ricard <christophe.ricard@gmail.com> | 2016-04-30 03:12:47 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2016-05-03 19:39:36 -0400 |
commit | c50e8fef7bb5e4a77609e4120940458e419d463f (patch) | |
tree | 181cbb84e9df23d6ed42b365a9970dfb65f36f50 /drivers/nfc | |
parent | 1f34b20404443717a7ec77b447d86578f0478550 (diff) |
nfc: st-nci: Remove redundant ST_NCI_HCI_HOST_ID_ESE from st-nci.h
ST_NCI_HCI_HOST_ID_ESE is already having an equivalent in se.c
(ST_NCI_ESE_HOST_ID).
Remove and replace where relevant.
Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r-- | drivers/nfc/st-nci/se.c | 4 | ||||
-rw-r--r-- | drivers/nfc/st-nci/st-nci.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c index edb6ee12a372..e7f25f4e3dc3 100644 --- a/drivers/nfc/st-nci/se.c +++ b/drivers/nfc/st-nci/se.c | |||
@@ -520,7 +520,7 @@ int st_nci_enable_se(struct nci_dev *ndev, u32 se_idx) | |||
520 | * Same for eSE. | 520 | * Same for eSE. |
521 | */ | 521 | */ |
522 | r = st_nci_control_se(ndev, se_idx, ST_NCI_SE_MODE_ON); | 522 | r = st_nci_control_se(ndev, se_idx, ST_NCI_SE_MODE_ON); |
523 | if (r == ST_NCI_HCI_HOST_ID_ESE) { | 523 | if (r == ST_NCI_ESE_HOST_ID) { |
524 | st_nci_se_get_atr(ndev); | 524 | st_nci_se_get_atr(ndev); |
525 | r = nci_hci_send_event(ndev, ST_NCI_APDU_READER_GATE, | 525 | r = nci_hci_send_event(ndev, ST_NCI_APDU_READER_GATE, |
526 | ST_NCI_EVT_SE_SOFT_RESET, NULL, 0); | 526 | ST_NCI_EVT_SE_SOFT_RESET, NULL, 0); |
@@ -665,7 +665,7 @@ int st_nci_se_io(struct nci_dev *ndev, u32 se_idx, | |||
665 | pr_debug("\n"); | 665 | pr_debug("\n"); |
666 | 666 | ||
667 | switch (se_idx) { | 667 | switch (se_idx) { |
668 | case ST_NCI_HCI_HOST_ID_ESE: | 668 | case ST_NCI_ESE_HOST_ID: |
669 | info->se_info.cb = cb; | 669 | info->se_info.cb = cb; |
670 | info->se_info.cb_context = cb_context; | 670 | info->se_info.cb_context = cb_context; |
671 | mod_timer(&info->se_info.bwi_timer, jiffies + | 671 | mod_timer(&info->se_info.bwi_timer, jiffies + |
diff --git a/drivers/nfc/st-nci/st-nci.h b/drivers/nfc/st-nci/st-nci.h index 8b9f77b0249c..8783f9594d65 100644 --- a/drivers/nfc/st-nci/st-nci.h +++ b/drivers/nfc/st-nci/st-nci.h | |||
@@ -32,7 +32,6 @@ | |||
32 | * sequence of at most 32 characters. | 32 | * sequence of at most 32 characters. |
33 | */ | 33 | */ |
34 | #define ST_NCI_ESE_MAX_LENGTH 33 | 34 | #define ST_NCI_ESE_MAX_LENGTH 33 |
35 | #define ST_NCI_HCI_HOST_ID_ESE 0xc0 | ||
36 | 35 | ||
37 | #define ST_NCI_DEVICE_MGNT_GATE 0x01 | 36 | #define ST_NCI_DEVICE_MGNT_GATE 0x01 |
38 | 37 | ||