staging: nvec: Move implementation-only macros out of the header

Those macros are needed only for implementation purposes and
do not have any use for other code wishing to use nvec.

Signed-off-by: Julian Andres Klode <jak@jak-linux.org>
Acked-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index 057c8889ff035dd73b0f74dc171a6856957d5580..3fa1c75bda8a62cd2b77d474b0351e12b7642dd9 100644 (file)
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -42,6 +42,26 @@
 
 #include "nvec.h"
 
+#define I2C_CNFG                       0x00
+#define I2C_CNFG_PACKET_MODE_EN                (1<<10)
+#define I2C_CNFG_NEW_MASTER_SFM                (1<<11)
+#define I2C_CNFG_DEBOUNCE_CNT_SHIFT    12
+
+#define I2C_SL_CNFG            0x20
+#define I2C_SL_NEWL            (1<<2)
+#define I2C_SL_NACK            (1<<1)
+#define I2C_SL_RESP            (1<<0)
+#define I2C_SL_IRQ             (1<<3)
+#define END_TRANS              (1<<4)
+#define RCVD                   (1<<2)
+#define RNW                    (1<<1)
+
+#define I2C_SL_RCVD            0x24
+#define I2C_SL_STATUS          0x28
+#define I2C_SL_ADDR1           0x2c
+#define I2C_SL_ADDR2           0x30
+#define I2C_SL_DELAY_COUNT     0x3c
+
 static const unsigned char EC_DISABLE_EVENT_REPORTING[3] = "\x04\x00\x00";
 static const unsigned char EC_ENABLE_EVENT_REPORTING[3]  = "\x04\x00\x01";
 static const unsigned char EC_GET_FIRMWARE_VERSION[2]    = "\x07\x15";

diff --git a/drivers/staging/nvec/nvec.h b/drivers/staging/nvec/nvec.h
index d1e4f57f851392f1e50b7ac3a0e9c9adc5a4a540..44787535c0eacfe674963f471870cf2f3b5f95ec 100644 (file)
--- a/drivers/staging/nvec/nvec.h
+++ b/drivers/staging/nvec/nvec.h
@@ -192,25 +192,4 @@ extern int nvec_register_notifier(struct nvec_chip *nvec,
 extern int nvec_unregister_notifier(struct device *dev,
                                    struct notifier_block *nb,
                                    unsigned int events);
-
-#define I2C_CNFG                       0x00
-#define I2C_CNFG_PACKET_MODE_EN                (1<<10)
-#define I2C_CNFG_NEW_MASTER_SFM                (1<<11)
-#define I2C_CNFG_DEBOUNCE_CNT_SHIFT    12
-
-#define I2C_SL_CNFG            0x20
-#define I2C_SL_NEWL            (1<<2)
-#define I2C_SL_NACK            (1<<1)
-#define I2C_SL_RESP            (1<<0)
-#define I2C_SL_IRQ             (1<<3)
-#define END_TRANS              (1<<4)
-#define RCVD                   (1<<2)
-#define RNW                    (1<<1)
-
-#define I2C_SL_RCVD            0x24
-#define I2C_SL_STATUS          0x28
-#define I2C_SL_ADDR1           0x2c
-#define I2C_SL_ADDR2           0x30
-#define I2C_SL_DELAY_COUNT     0x3c
-
 #endif