openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Christophe Ricard 2016-04-30 09:12:47 +02:00 committed by Samuel Ortiz
parent 1f34b20404
commit c50e8fef7b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/nfc/st-nci/se.c
View File

@ -520,7 +520,7 @@ int st_nci_enable_se(struct nci_dev *ndev, u32 se_idx)
* Same for eSE. * Same for eSE.
*/ */
r = st_nci_control_se(ndev, se_idx, ST_NCI_SE_MODE_ON); r = st_nci_control_se(ndev, se_idx, ST_NCI_SE_MODE_ON);
if (r == ST_NCI_HCI_HOST_ID_ESE) { if (r == ST_NCI_ESE_HOST_ID) {
st_nci_se_get_atr(ndev); st_nci_se_get_atr(ndev);
r = nci_hci_send_event(ndev, ST_NCI_APDU_READER_GATE, r = nci_hci_send_event(ndev, ST_NCI_APDU_READER_GATE,
ST_NCI_EVT_SE_SOFT_RESET, NULL, 0); ST_NCI_EVT_SE_SOFT_RESET, NULL, 0);
@ -665,7 +665,7 @@ int st_nci_se_io(struct nci_dev *ndev, u32 se_idx,
pr_debug("\n"); pr_debug("\n");
switch (se_idx) { switch (se_idx) {
case ST_NCI_HCI_HOST_ID_ESE: case ST_NCI_ESE_HOST_ID:
info->se_info.cb = cb; info->se_info.cb = cb;
info->se_info.cb_context = cb_context; info->se_info.cb_context = cb_context;
mod_timer(&info->se_info.bwi_timer, jiffies + mod_timer(&info->se_info.bwi_timer, jiffies +

1
drivers/nfc/st-nci/st-nci.h
View File

@ -32,7 +32,6 @@
* sequence of at most 32 characters. * sequence of at most 32 characters.
*/ */
#define ST_NCI_ESE_MAX_LENGTH 33 #define ST_NCI_ESE_MAX_LENGTH 33
#define ST_NCI_HCI_HOST_ID_ESE 0xc0
#define ST_NCI_DEVICE_MGNT_GATE 0x01 #define ST_NCI_DEVICE_MGNT_GATE 0x01