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

diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 44597e50cfd62b18db109030a7b2a578d58b670e..dce4f9381c26d979bc174b3ccdeb04410dc89d45 100644 (file)
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -34,3 +34,7 @@ obj-$(CONFIG_I2C_VIAPRO)      += i2c-viapro.o
 obj-$(CONFIG_I2C_VOODOO3)      += i2c-voodoo3.o
 obj-$(CONFIG_SCx200_ACB)       += scx200_acb.o
 obj-$(CONFIG_SCx200_I2C)       += scx200_i2c.o
+
+ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
+EXTRA_CFLAGS += -DDEBUG
+endif

diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index d291e2006157cd4d0f5adcf6d0d59a847182ded3..6715b0d14c04825e3e79c5e72c2bb080b02c0b59 100644 (file)
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -54,10 +54,6 @@
 /* Note: we assume there can only be one ALI1535, with one SMBus interface */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 085cd7f7dafa1dd8d55c3bb234626ffa047f39a3..446606c91776446031d864456c767b57b4e55383 100644 (file)
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -61,10 +61,6 @@
 /* Note: we assume there can only be one ALI15X3, with one SMBus interface */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 356da2dbc21b43a2601d7e4b3dda2bf916f8e5cb..261b5d9169860e9779b4a06ab1eceb1bf596f537 100644 (file)
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -38,10 +38,6 @@
 */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index 9872f4f5e131427c770880f0fa2b1a586c32a14c..7ad6f7e501a3e1fa89853bfd30127511f485c999 100644 (file)
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -9,10 +9,6 @@
  */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c
index 3285c2b4b570f646346c1f4b0978dd0472de84e9..c16d97e957b32bb36eb958ac484f86cc8d834ccd 100644 (file)
--- a/drivers/i2c/busses/i2c-elektor.c
+++ b/drivers/i2c/busses/i2c-elektor.c
@@ -26,10 +26,6 @@
    for Alpha Processor Inc. UP-2000(+) boards */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/ioport.h>
 #include <linux/module.h>

diff --git a/drivers/i2c/busses/i2c-elv.c b/drivers/i2c/busses/i2c-elv.c
index 391c7780fdbee33ba50ced0df55d4cf69b5e0942..8018729132c6aa48cf75695bed19c7bb44c8623b 100644 (file)
--- a/drivers/i2c/busses/i2c-elv.c
+++ b/drivers/i2c/busses/i2c-elv.c
@@ -22,10 +22,6 @@
    Frodo Looijaard <frodol@dds.nl> */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>

diff --git a/drivers/i2c/busses/i2c-frodo.c b/drivers/i2c/busses/i2c-frodo.c
index ca85eb34bdabdea2e35ccc29c960705ef2390a95..e093829a0bf73164bfbf7bc0e9dbf55b7f7deaa8 100644 (file)
--- a/drivers/i2c/busses/i2c-frodo.c
+++ b/drivers/i2c/busses/i2c-frodo.c
@@ -13,10 +13,6 @@
  */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 854f544a260b3798138ac7e2ff4faa900503e1bf..d0612fb8ddb16ef1c978c7abbe67e727aeedfaa5 100644 (file)
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -39,10 +39,6 @@
 /* Note: we assume there can only be one I801, with one SMBus interface */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

diff --git a/drivers/i2c/busses/i2c-i810.c b/drivers/i2c/busses/i2c-i810.c
index 97f76344b715ebaf9c897c146091cdfb2e0a3e41..fd11366cc67e27e19b2838de945936999a4f83e5 100644 (file)
--- a/drivers/i2c/busses/i2c-i810.c
+++ b/drivers/i2c/busses/i2c-i810.c
@@ -35,10 +35,6 @@
 */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index beda22c0b4935ca0d8e8195b5add3c3ad34209fb..35c7714786b4b1efe49ceb0e9c5ffbd22a507971 100644 (file)
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -29,10 +29,6 @@
  */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>

diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index a29568f9d6ed992e8b51a05eece82a2fb85f039f..844aa3e03256dbcab7cf1127374d909300ce5ada 100644 (file)
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -32,10 +32,6 @@
   ---------------------------------------------------------------------------*/
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>

diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index 653ac4e9e455ce8489c8e0098b4de25f569757f5..73387ad269343bbab4075bb688e468202f82c9bd 100644 (file)
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -25,10 +25,6 @@
    of this. */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>

diff --git a/drivers/i2c/busses/i2c-ite.c b/drivers/i2c/busses/i2c-ite.c
index 11b118e3acbbe0e34d789a6ec811ab909d93865f..917759c42d9910d3e21877fb0bf5d37c7d136b9c 100644 (file)
--- a/drivers/i2c/busses/i2c-ite.c
+++ b/drivers/i2c/busses/i2c-ite.c
@@ -34,10 +34,6 @@
    Frodo Looijaard <frodol@dds.nl> */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/ioport.h>
 #include <linux/module.h>

diff --git a/drivers/i2c/busses/i2c-ixp42x.c b/drivers/i2c/busses/i2c-ixp42x.c
index b21d2bf566d605b3fbec018e25f754445ff86ffd..59fcb70fd252cb6137de3a22635947e243002761 100644 (file)
--- a/drivers/i2c/busses/i2c-ixp42x.c
+++ b/drivers/i2c/busses/i2c-ixp42x.c
@@ -27,10 +27,6 @@
  */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/device.h>

diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c
index b2164201cc3bd9eb8ec37fa38410f96d42d5f431..74af8459765b441336497e061a96a0b63c998bcf 100644 (file)
--- a/drivers/i2c/busses/i2c-keywest.c
+++ b/drivers/i2c/busses/i2c-keywest.c
@@ -47,10 +47,6 @@
 */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/config.h>
 #include <linux/kernel.h>

diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 3b4e514a37554475c69762955695e8138fadd246..214f5644cc5540386efa5350ec85420507a4dcae 100644 (file)
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -33,10 +33,6 @@
 /* Note: we assume there can only be one nForce2, with two SMBus interfaces */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c
index f6fa15878d562d3dd240a09ec8bc92896d0193c9..c73fadc061a7a039c904c4dd4df2096d4d041bca 100644 (file)
--- a/drivers/i2c/busses/i2c-parport-light.c
+++ b/drivers/i2c/busses/i2c-parport-light.c
@@ -25,10 +25,6 @@
  * ------------------------------------------------------------------------ */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index fab32a1a044dffc89307e358985188bce73dc57e..6a9b764caadaea6667d34c5a7714d9b0e4a4b5f9 100644 (file)
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -25,10 +25,6 @@
  * ------------------------------------------------------------------------ */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

diff --git a/drivers/i2c/busses/i2c-philips-par.c b/drivers/i2c/busses/i2c-philips-par.c
index f1bbb148e11a1b0be4635d13a5fe50692b548ba5..f3f370d32828e01b6d00c4f9e70f5726f6a034a0 100644 (file)
--- a/drivers/i2c/busses/i2c-philips-par.c
+++ b/drivers/i2c/busses/i2c-philips-par.c
@@ -22,10 +22,6 @@
    Frodo Looijaard <frodol@dds.nl> */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index c0aeaba29467f5b39905b600d91cf9b3f0eb979b..8edc957e51c509ec77536fd5619aa484ddf6b398 100644 (file)
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -29,10 +29,6 @@
 */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/config.h>

diff --git a/drivers/i2c/busses/i2c-prosavage.c b/drivers/i2c/busses/i2c-prosavage.c
index e1908c3f26eb6b43a2bbd94042e4628c1069f12c..0aabe49e5571aeb4de85982ada40c9ad37f21a54 100644 (file)
--- a/drivers/i2c/busses/i2c-prosavage.c
+++ b/drivers/i2c/busses/i2c-prosavage.c
@@ -55,10 +55,6 @@
  */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/pci.h>

diff --git a/drivers/i2c/busses/i2c-rpx.c b/drivers/i2c/busses/i2c-rpx.c
index 16e35c64ab7040118e30599654d2526634cab5cb..5d4ee2c4ea08c341fbb113ad933c274477f2b3da 100644 (file)
--- a/drivers/i2c/busses/i2c-rpx.c
+++ b/drivers/i2c/busses/i2c-rpx.c
@@ -12,10 +12,6 @@
  */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

diff --git a/drivers/i2c/busses/i2c-savage4.c b/drivers/i2c/busses/i2c-savage4.c
index fa2e1268aa3fa9d794fced0c8b1d468d6797b89f..33972a779b8b8ee695aa99b98ff17d147b3f883d 100644 (file)
--- a/drivers/i2c/busses/i2c-savage4.c
+++ b/drivers/i2c/busses/i2c-savage4.c
@@ -30,10 +30,6 @@
 */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index 2e06dfe636d1bb54d527e5edcfee63d0445ec710..90b72690994ae99624424aaffee2001edb4e69c3 100644 (file)
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -56,10 +56,6 @@
  */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>

diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index dc6b2cb67776d8e1ef999e3a98482551f52bf5ab..516f51abe901ded679bf26f63e6201a9795061e0 100644 (file)
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -49,10 +49,6 @@
 */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>

diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index d59c63a6738729c37baf26ae067fc2417ea40ec8..c1d456b049a0254328581cb02bdb723656a98dcc 100644 (file)
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -33,10 +33,6 @@
 */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

diff --git a/drivers/i2c/busses/i2c-velleman.c b/drivers/i2c/busses/i2c-velleman.c
index 6d8c64919994e461a5b283567e9af08411d0d27b..da3cdc29537fd17a9e1626f77667cd5fdf513522 100644 (file)
--- a/drivers/i2c/busses/i2c-velleman.c
+++ b/drivers/i2c/busses/i2c-velleman.c
@@ -19,10 +19,6 @@
 /* ------------------------------------------------------------------------- */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/ioport.h>
 #include <linux/module.h>

diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c
index c46aef0a7e99731b814176119f4910b8926627a5..6ed3ff0806308debbbcac875268493057002d2c6 100644 (file)
--- a/drivers/i2c/busses/i2c-via.c
+++ b/drivers/i2c/busses/i2c-via.c
@@ -22,10 +22,6 @@
 */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>

diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 7f9043ab06378aeeeac61a02137f669e656721b6..c45b33f3802f6cf1c6f4fba3171052634b86095a 100644 (file)
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -34,10 +34,6 @@
 */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

diff --git a/drivers/i2c/busses/i2c-voodoo3.c b/drivers/i2c/busses/i2c-voodoo3.c
index bef36b1669516139ab888ba8ee6a3835dfeb10c4..3d4fad692993e43910ab9f788afdc247652ceba4 100644 (file)
--- a/drivers/i2c/busses/i2c-voodoo3.c
+++ b/drivers/i2c/busses/i2c-voodoo3.c
@@ -28,10 +28,6 @@
     the BT869 and possibly other I2C devices. */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index 3dd8d107a6db89dc37efd770136a1abf0a4e3908..2a33ae4167822066f6bedb957c8e6f03c9f5d17a 100644 (file)
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -25,10 +25,6 @@
 */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>

diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c
index 6179fba02ff2cea2f3db3fd08be101656efc276f..14bcb0aee2eb989e37496a2625d40fcdd89b62ab 100644 (file)
--- a/drivers/i2c/busses/scx200_i2c.c
+++ b/drivers/i2c/busses/scx200_i2c.c
@@ -22,10 +22,6 @@
 */
 
 #include <linux/config.h>
-#ifdef CONFIG_I2C_DEBUG_BUS
-#define DEBUG  1
-#endif
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>