From 0fd0b1f66baa7325b4e2c82a7c6d88f3bd6ec0ec Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 14 Mar 2004 18:27:26 -0800 Subject: [PATCH] [PATCH] I2C: fix up CONFIG_I2C_DEBUG_BUS logic to be simpler on the .c files. --- drivers/i2c/busses/Makefile | 4 ++++ drivers/i2c/busses/i2c-ali1535.c | 4 ---- drivers/i2c/busses/i2c-ali15x3.c | 4 ---- drivers/i2c/busses/i2c-amd756.c | 4 ---- drivers/i2c/busses/i2c-amd8111.c | 4 ---- drivers/i2c/busses/i2c-elektor.c | 4 ---- drivers/i2c/busses/i2c-elv.c | 4 ---- drivers/i2c/busses/i2c-frodo.c | 4 ---- drivers/i2c/busses/i2c-i801.c | 4 ---- drivers/i2c/busses/i2c-i810.c | 4 ---- drivers/i2c/busses/i2c-ibm_iic.c | 4 ---- drivers/i2c/busses/i2c-iop3xx.c | 4 ---- drivers/i2c/busses/i2c-isa.c | 4 ---- drivers/i2c/busses/i2c-ite.c | 4 ---- drivers/i2c/busses/i2c-ixp42x.c | 4 ---- drivers/i2c/busses/i2c-keywest.c | 4 ---- drivers/i2c/busses/i2c-nforce2.c | 4 ---- drivers/i2c/busses/i2c-parport-light.c | 4 ---- drivers/i2c/busses/i2c-parport.c | 4 ---- drivers/i2c/busses/i2c-philips-par.c | 4 ---- drivers/i2c/busses/i2c-piix4.c | 4 ---- drivers/i2c/busses/i2c-prosavage.c | 4 ---- drivers/i2c/busses/i2c-rpx.c | 4 ---- drivers/i2c/busses/i2c-savage4.c | 4 ---- drivers/i2c/busses/i2c-sis5595.c | 4 ---- drivers/i2c/busses/i2c-sis630.c | 4 ---- drivers/i2c/busses/i2c-sis96x.c | 4 ---- drivers/i2c/busses/i2c-velleman.c | 4 ---- drivers/i2c/busses/i2c-via.c | 4 ---- drivers/i2c/busses/i2c-viapro.c | 4 ---- drivers/i2c/busses/i2c-voodoo3.c | 4 ---- drivers/i2c/busses/scx200_acb.c | 4 ---- drivers/i2c/busses/scx200_i2c.c | 4 ---- 33 files changed, 4 insertions(+), 128 deletions(-) diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index 44597e50cfd6..dce4f9381c26 100644 --- 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 d291e2006157..6715b0d14c04 100644 --- 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 -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c index 085cd7f7dafa..446606c91776 100644 --- 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 -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c index 356da2dbc21b..261b5d916986 100644 --- a/drivers/i2c/busses/i2c-amd756.c +++ b/drivers/i2c/busses/i2c-amd756.c @@ -38,10 +38,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c index 9872f4f5e131..7ad6f7e501a3 100644 --- a/drivers/i2c/busses/i2c-amd8111.c +++ b/drivers/i2c/busses/i2c-amd8111.c @@ -9,10 +9,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c index 3285c2b4b570..c16d97e957b3 100644 --- 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 -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-elv.c b/drivers/i2c/busses/i2c-elv.c index 391c7780fdbe..8018729132c6 100644 --- a/drivers/i2c/busses/i2c-elv.c +++ b/drivers/i2c/busses/i2c-elv.c @@ -22,10 +22,6 @@ Frodo Looijaard */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-frodo.c b/drivers/i2c/busses/i2c-frodo.c index ca85eb34bdab..e093829a0bf7 100644 --- a/drivers/i2c/busses/i2c-frodo.c +++ b/drivers/i2c/busses/i2c-frodo.c @@ -13,10 +13,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 854f544a260b..d0612fb8ddb1 100644 --- 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 -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-i810.c b/drivers/i2c/busses/i2c-i810.c index 97f76344b715..fd11366cc67e 100644 --- a/drivers/i2c/busses/i2c-i810.c +++ b/drivers/i2c/busses/i2c-i810.c @@ -35,10 +35,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index beda22c0b493..35c7714786b4 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c @@ -29,10 +29,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index a29568f9d6ed..844aa3e03256 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c @@ -32,10 +32,6 @@ ---------------------------------------------------------------------------*/ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c index 653ac4e9e455..73387ad26934 100644 --- a/drivers/i2c/busses/i2c-isa.c +++ b/drivers/i2c/busses/i2c-isa.c @@ -25,10 +25,6 @@ of this. */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-ite.c b/drivers/i2c/busses/i2c-ite.c index 11b118e3acbb..917759c42d99 100644 --- a/drivers/i2c/busses/i2c-ite.c +++ b/drivers/i2c/busses/i2c-ite.c @@ -34,10 +34,6 @@ Frodo Looijaard */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-ixp42x.c b/drivers/i2c/busses/i2c-ixp42x.c index b21d2bf566d6..59fcb70fd252 100644 --- a/drivers/i2c/busses/i2c-ixp42x.c +++ b/drivers/i2c/busses/i2c-ixp42x.c @@ -27,10 +27,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c index b2164201cc3b..74af8459765b 100644 --- a/drivers/i2c/busses/i2c-keywest.c +++ b/drivers/i2c/busses/i2c-keywest.c @@ -47,10 +47,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c index 3b4e514a3755..214f5644cc55 100644 --- 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 -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c index f6fa15878d56..c73fadc061a7 100644 --- a/drivers/i2c/busses/i2c-parport-light.c +++ b/drivers/i2c/busses/i2c-parport-light.c @@ -25,10 +25,6 @@ * ------------------------------------------------------------------------ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c index fab32a1a044d..6a9b764caada 100644 --- a/drivers/i2c/busses/i2c-parport.c +++ b/drivers/i2c/busses/i2c-parport.c @@ -25,10 +25,6 @@ * ------------------------------------------------------------------------ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-philips-par.c b/drivers/i2c/busses/i2c-philips-par.c index f1bbb148e11a..f3f370d32828 100644 --- a/drivers/i2c/busses/i2c-philips-par.c +++ b/drivers/i2c/busses/i2c-philips-par.c @@ -22,10 +22,6 @@ Frodo Looijaard */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index c0aeaba29467..8edc957e51c5 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c @@ -29,10 +29,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-prosavage.c b/drivers/i2c/busses/i2c-prosavage.c index e1908c3f26eb..0aabe49e5571 100644 --- a/drivers/i2c/busses/i2c-prosavage.c +++ b/drivers/i2c/busses/i2c-prosavage.c @@ -55,10 +55,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-rpx.c b/drivers/i2c/busses/i2c-rpx.c index 16e35c64ab70..5d4ee2c4ea08 100644 --- a/drivers/i2c/busses/i2c-rpx.c +++ b/drivers/i2c/busses/i2c-rpx.c @@ -12,10 +12,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-savage4.c b/drivers/i2c/busses/i2c-savage4.c index fa2e1268aa3f..33972a779b8b 100644 --- a/drivers/i2c/busses/i2c-savage4.c +++ b/drivers/i2c/busses/i2c-savage4.c @@ -30,10 +30,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c index 2e06dfe636d1..90b72690994a 100644 --- a/drivers/i2c/busses/i2c-sis5595.c +++ b/drivers/i2c/busses/i2c-sis5595.c @@ -56,10 +56,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c index dc6b2cb67776..516f51abe901 100644 --- a/drivers/i2c/busses/i2c-sis630.c +++ b/drivers/i2c/busses/i2c-sis630.c @@ -49,10 +49,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c index d59c63a67387..c1d456b049a0 100644 --- a/drivers/i2c/busses/i2c-sis96x.c +++ b/drivers/i2c/busses/i2c-sis96x.c @@ -33,10 +33,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-velleman.c b/drivers/i2c/busses/i2c-velleman.c index 6d8c64919994..da3cdc29537f 100644 --- a/drivers/i2c/busses/i2c-velleman.c +++ b/drivers/i2c/busses/i2c-velleman.c @@ -19,10 +19,6 @@ /* ------------------------------------------------------------------------- */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c index c46aef0a7e99..6ed3ff080630 100644 --- a/drivers/i2c/busses/i2c-via.c +++ b/drivers/i2c/busses/i2c-via.c @@ -22,10 +22,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c index 7f9043ab0637..c45b33f3802f 100644 --- a/drivers/i2c/busses/i2c-viapro.c +++ b/drivers/i2c/busses/i2c-viapro.c @@ -34,10 +34,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/i2c-voodoo3.c b/drivers/i2c/busses/i2c-voodoo3.c index bef36b166951..3d4fad692993 100644 --- 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 -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c index 3dd8d107a6db..2a33ae416782 100644 --- a/drivers/i2c/busses/scx200_acb.c +++ b/drivers/i2c/busses/scx200_acb.c @@ -25,10 +25,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c index 6179fba02ff2..14bcb0aee2eb 100644 --- a/drivers/i2c/busses/scx200_i2c.c +++ b/drivers/i2c/busses/scx200_i2c.c @@ -22,10 +22,6 @@ */ #include -#ifdef CONFIG_I2C_DEBUG_BUS -#define DEBUG 1 -#endif - #include #include #include -- 2.39.5