NFC: st21nfca: Clean up st21nfca.h macros

Clean up st21nfca.h macros and move the one only used in st21nfca.c.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
index 438e06e6eb6a15f87bddef7555485281055023c8..bff657524b181a94ba5a619a856c2b95f44db4e9 100644 (file)
--- a/drivers/nfc/st21nfca/st21nfca.c
+++ b/drivers/nfc/st21nfca/st21nfca.c
@@ -45,6 +45,23 @@
 #define ST21NFCA_RF_READER_14443_3_A_ATQA      0x03
 #define ST21NFCA_RF_READER_14443_3_A_SAK       0x04
 
+#define ST21NFCA_RF_READER_F_DATARATE          0x01
+#define ST21NFCA_RF_READER_F_DATARATE_106      0x01
+#define ST21NFCA_RF_READER_F_DATARATE_212      0x02
+#define ST21NFCA_RF_READER_F_DATARATE_424      0x04
+#define ST21NFCA_RF_READER_F_POL_REQ           0x02
+#define ST21NFCA_RF_READER_F_POL_REQ_DEFAULT    0xffff0000
+#define ST21NFCA_RF_READER_F_NFCID2            0x03
+#define ST21NFCA_RF_READER_F_NFCID1            0x04
+
+#define ST21NFCA_RF_CARD_F_MODE                0x01
+#define ST21NFCA_RF_CARD_F_NFCID2_LIST                 0x04
+#define ST21NFCA_RF_CARD_F_NFCID1              0x05
+#define ST21NFCA_RF_CARD_F_SENS_RES            0x06
+#define ST21NFCA_RF_CARD_F_SEL_RES             0x07
+#define ST21NFCA_RF_CARD_F_DATARATE            0x08
+#define ST21NFCA_RF_CARD_F_DATARATE_212_424    0x01
+
 #define ST21NFCA_DEVICE_MGNT_GATE              0x01
 #define ST21NFCA_DEVICE_MGNT_PIPE              0x02
 
@@ -60,6 +77,10 @@
        ((p & 0x0f) == (ST21NFCA_DM_PIPE_CREATED | ST21NFCA_DM_PIPE_OPEN))
 
 #define ST21NFCA_NFC_MODE      0x03    /* NFC_MODE parameter*/
+#define ST21NFCA_EVT_FIELD_ON                  0x11
+#define ST21NFCA_EVT_CARD_DEACTIVATED          0x12
+#define ST21NFCA_EVT_CARD_ACTIVATED            0x13
+#define ST21NFCA_EVT_FIELD_OFF                 0x14
 
 static DECLARE_BITMAP(dev_mask, ST21NFCA_NUM_DEVICES);
 

diff --git a/drivers/nfc/st21nfca/st21nfca.h b/drivers/nfc/st21nfca/st21nfca.h
index 96fe5a62dc0dced5dd7ed41ee2f33496e1a1d61e..a0b77f1ba6d905ae07f322414250bfc4ee6cbc9c 100644 (file)
--- a/drivers/nfc/st21nfca/st21nfca.h
+++ b/drivers/nfc/st21nfca/st21nfca.h
@@ -82,30 +82,9 @@ struct st21nfca_hci_info {
 #define ST21NFCA_WR_XCHG_DATA            0x10
 
 #define ST21NFCA_RF_READER_F_GATE               0x14
-#define ST21NFCA_RF_READER_F_DATARATE 0x01
-#define ST21NFCA_RF_READER_F_DATARATE_106 0x01
-#define ST21NFCA_RF_READER_F_DATARATE_212 0x02
-#define ST21NFCA_RF_READER_F_DATARATE_424 0x04
-#define ST21NFCA_RF_READER_F_POL_REQ    0x02
-#define ST21NFCA_RF_READER_F_POL_REQ_DEFAULT    0xffff0000
-#define ST21NFCA_RF_READER_F_NFCID2 0x03
-#define ST21NFCA_RF_READER_F_NFCID1 0x04
-#define ST21NFCA_RF_READER_F_SENS_RES 0x05
 
 #define ST21NFCA_RF_CARD_F_GATE 0x24
-#define ST21NFCA_RF_CARD_F_MODE 0x01
-#define ST21NFCA_RF_CARD_F_NFCID2_LIST 0x04
-#define ST21NFCA_RF_CARD_F_NFCID1 0x05
-#define ST21NFCA_RF_CARD_F_SENS_RES 0x06
-#define ST21NFCA_RF_CARD_F_SEL_RES 0x07
-#define ST21NFCA_RF_CARD_F_DATARATE 0x08
-#define ST21NFCA_RF_CARD_F_DATARATE_106 0x00
-#define ST21NFCA_RF_CARD_F_DATARATE_212_424 0x01
 
 #define ST21NFCA_EVT_SEND_DATA 0x10
-#define ST21NFCA_EVT_FIELD_ON 0x11
-#define ST21NFCA_EVT_CARD_DEACTIVATED 0x12
-#define ST21NFCA_EVT_CARD_ACTIVATED 0x13
-#define ST21NFCA_EVT_FIELD_OFF 0x14
 
 #endif /* __LOCAL_ST21NFCA_H_ */