Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c50e8fef authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz
Browse files

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: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 1f34b204

drivers/nfc/st-nci/se.c

+2 −2
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ int st_nci_enable_se(struct nci_dev *ndev, u32 se_idx) 
	 * Same for eSE.

	 */

	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);

		r = nci_hci_send_event(ndev, ST_NCI_APDU_READER_GATE,

				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");



	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_context = cb_context;

		mod_timer(&info->se_info.bwi_timer, jiffies +

drivers/nfc/st-nci/st-nci.h

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
 * sequence of at most 32 characters.

 */

#define ST_NCI_ESE_MAX_LENGTH  33

#define ST_NCI_HCI_HOST_ID_ESE 0xc0



#define ST_NCI_DEVICE_MGNT_GATE		0x01