[PATCH] I2C: fix up CONFIG_I2C_DEBUG_CORE logic to be simpler on the .c files.

diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index b2ded05c1e7f545801abc33e4d674660ff72a35f..2b48079f536873f8a5efafbfae8066419605b08d 100644 (file)
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -6,3 +6,7 @@ obj-$(CONFIG_I2C)               += i2c-core.o
 obj-$(CONFIG_I2C_CHARDEV)      += i2c-dev.o
 obj-$(CONFIG_I2C_SENSOR)       += i2c-sensor.o
 obj-y                          += busses/ chips/ algos/
+
+ifeq ($(CONFIG_I2C_DEBUG_CORE),y)
+EXTRA_CFLAGS += -DDEBUG
+endif

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 10340b54762370b7d123d48b6904780cd96fe43d..8663e1b8ae4bc6ab2d627e219ff20150f4abbb54 100644 (file)
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -22,10 +22,6 @@
    SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com>                */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_CORE
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>

diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index e99133adccfd5dd3e622706426ddd6d45e7d9f82..1369761431f5ca5fc8a481a38b2db629480d3d6b 100644 (file)
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -30,10 +30,6 @@
    <pmhahn@titan.lahn.de> */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_CORE
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/fs.h>

diff --git a/drivers/i2c/i2c-sensor.c b/drivers/i2c/i2c-sensor.c
index a2740258458fdbf647c1e5e3c1638b4447a5287f..b9714c6ec935b20e0257fcbccadd8f18f87327d8 100644 (file)
--- a/drivers/i2c/i2c-sensor.c
+++ b/drivers/i2c/i2c-sensor.c
@@ -20,10 +20,6 @@
 */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_CORE
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>