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>

diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c
index edb6ee12a372a0c7223f6c52b2215d2ca714a0dd..e7f25f4e3dc3f465ad4ee32981f1f66fab354fc6 100644 (file)
--- 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)
         * 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 +

diff --git a/drivers/nfc/st-nci/st-nci.h b/drivers/nfc/st-nci/st-nci.h
index 8b9f77b0249cba10bafcc9512a1ea01a18d8a50a..8783f9594d65332b3fdf862059be265b8b631f41 100644 (file)
--- a/drivers/nfc/st-nci/st-nci.h
+++ b/drivers/nfc/st-nci/st-nci.h
@@ -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