drivers/i2c/*: #include <linux/config.h> cleanup

PATCH New Jean Delvare 3 participants 4 messages May 19, 2005

Subsystems (6)

Arm Samsung Exynos I2C subsystem host drivers I2C I2C/smbus controller drivers for pc +2 more subsystems

lore

Share & tools

lore

Jean Delvare

author

2005-05-19 06:25 UTC #0 lore raw

PATCH 1/1 drivers/i2c/*: #include <linux/config.h> cleanup

Hi Alexey,

Quoted 4 lines

Files that don't use CONFIG_* stuff shouldn't include config.h Files that use CONFIG_* stuff should include config.h
It's that simple. ;-)

I agree. This won't change anything though, as all drivers include either device.h or module.h, which in turn include config.h. But you are still correct, so I approve your patch.

For completeness, I would propose the following on top of your own patch:

i2c bus drivers do not need to define DEBUG themselves, as the Kconfig system takes care of it.

Signed-off-by Jean Delvare <[email protected]>

Index: linux-2.6.12-rc2/drivers/i2c/busses/i2c-ixp2000.c
=================================--- linux-2.6.12-rc2.orig/drivers/i2c/busses/i2c-ixp2000.c 2004-12-24 22:35:50.000000000 +0100
+++ linux-2.6.12-rc2/drivers/i2c/busses/i2c-ixp2000.c 2005-04-16 18:41:14.000000000 +0200
@@ -26,11 +26,6 @@
* 'enabled' to drive the GPIOs.
*/

-#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>
Index: linux-2.6.12-rc2/drivers/i2c/busses/i2c-ixp4xx.c
=================================--- linux-2.6.12-rc2.orig/drivers/i2c/busses/i2c-ixp4xx.c 2005-04-06 19:42:31.000000000 +0200
+++ linux-2.6.12-rc2/drivers/i2c/busses/i2c-ixp4xx.c 2005-04-16 18:41:00.000000000 +0200
@@ -26,11 +26,6 @@
* that is passed as the platform_data to this driver.
*/

-#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>

Signature · 1 line

Jean Delvare

Alexey Dobriyan

2005-05-19 06:25 UTC #1 lore raw

PATCH 1/1 drivers/i2c/*: #include <linux/config.h> cleanup

-------------- next part --------------
Files that don't use CONFIG_* stuff shouldn't include config.h Files that use CONFIG_* stuff should include config.h

It's that simple. ;-)

Signed-off-by Alexey Dobriyan <[email protected]>

---

 drivers/i2c/algos/i2c-algo-sibyte.c    |    1 -
 drivers/i2c/busses/i2c-ali1535.c       |    1 -
 drivers/i2c/busses/i2c-ali15x3.c       |    1 -
 drivers/i2c/busses/i2c-amd756.c        |    1 -
 drivers/i2c/busses/i2c-amd8111.c       |    1 -
 drivers/i2c/busses/i2c-au1550.c        |    1 -
 drivers/i2c/busses/i2c-elektor.c       |    1 -
 drivers/i2c/busses/i2c-frodo.c         |    1 -
 drivers/i2c/busses/i2c-i801.c          |    1 -
 drivers/i2c/busses/i2c-i810.c          |    1 -
 drivers/i2c/busses/i2c-ibm_iic.h       |    1 -
 drivers/i2c/busses/i2c-isa.c           |    1 -
 drivers/i2c/busses/i2c-ite.c           |    1 -
 drivers/i2c/busses/i2c-keywest.c       |    1 -
 drivers/i2c/busses/i2c-nforce2.c       |    1 -
 drivers/i2c/busses/i2c-parport-light.c |    1 -
 drivers/i2c/busses/i2c-parport.c       |    1 -
 drivers/i2c/busses/i2c-pca-isa.c       |    1 -
 drivers/i2c/busses/i2c-piix4.c         |    1 -
 drivers/i2c/busses/i2c-prosavage.c     |    1 -
 drivers/i2c/busses/i2c-rpx.c           |    1 -
 drivers/i2c/busses/i2c-s3c2410.c       |    1 +
 drivers/i2c/busses/i2c-savage4.c       |    1 -
 drivers/i2c/busses/i2c-sibyte.c        |    1 -
 drivers/i2c/busses/i2c-sis5595.c       |    1 -
 drivers/i2c/busses/i2c-sis630.c        |    1 -
 drivers/i2c/busses/i2c-sis96x.c        |    1 -
 drivers/i2c/busses/i2c-stub.c          |    1 -
 drivers/i2c/busses/i2c-via.c           |    1 -
 drivers/i2c/busses/i2c-viapro.c        |    1 -
 drivers/i2c/busses/i2c-voodoo3.c       |    1 -
 drivers/i2c/busses/scx200_acb.c        |    1 -
 drivers/i2c/chips/adm1021.c            |    1 -
 drivers/i2c/chips/adm1025.c            |    1 -
 drivers/i2c/chips/adm1026.c            |    1 -
 drivers/i2c/chips/ds1337.c             |    1 -
 drivers/i2c/chips/eeprom.c             |    1 -
 drivers/i2c/chips/fscher.c             |    1 -
 drivers/i2c/chips/gl518sm.c            |    1 -
 drivers/i2c/chips/it87.c               |    1 -
 drivers/i2c/chips/lm63.c               |    1 -
 drivers/i2c/chips/lm75.c               |    1 -
 drivers/i2c/chips/lm77.c               |    1 -
 drivers/i2c/chips/lm78.c               |    1 -
 drivers/i2c/chips/lm80.c               |    1 -
 drivers/i2c/chips/lm83.c               |    1 -
 drivers/i2c/chips/lm85.c               |    1 -
 drivers/i2c/chips/lm87.c               |    1 -
 drivers/i2c/chips/lm90.c               |    1 -
 drivers/i2c/chips/max1619.c            |    1 -
 drivers/i2c/chips/pc87360.c            |    1 -
 drivers/i2c/chips/via686a.c            |    1 -
 drivers/i2c/chips/w83781d.c            |    1 -
 drivers/i2c/chips/w83l785ts.c          |    1 -
 drivers/i2c/i2c-core.c                 |    1 -
 drivers/i2c/i2c-dev.c                  |    1 -
 56 files changed, 1 insertion(+), 55 deletions(-)

drivers/i2c/algos/i2c-algo-sibyte.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/algos/i2c-algo-sibyte.c linux-2.6.12-rc2-config.h/drivers/i2c/algos/i2c-algo-sibyte.c
@@ -24,7 +24,6 @@
 
 /* Ported for SiByte SOCs by Broadcom Corporation.  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

drivers/i2c/busses/i2c-ali1535.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-ali1535.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-ali1535.c
@@ -53,7 +53,6 @@
 
 /* Note: we assume there can only be one ALI1535, with one SMBus interface */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

drivers/i2c/busses/i2c-ali15x3.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-ali15x3.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-ali15x3.c
@@ -60,7 +60,6 @@
 
 /* Note: we assume there can only be one ALI15X3, with one SMBus interface */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

drivers/i2c/busses/i2c-amd756.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-amd756.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-amd756.c
@@ -37,7 +37,6 @@
    Note: we assume there can only be one device, with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

drivers/i2c/busses/i2c-amd8111.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-amd8111.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-amd8111.c
@@ -8,7 +8,6 @@
  * the Free Software Foundation version 2.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

drivers/i2c/busses/i2c-au1550.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-au1550.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-au1550.c
@@ -27,7 +27,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <linux/config.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/module.h>

drivers/i2c/busses/i2c-elektor.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-elektor.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-elektor.c
@@ -25,7 +25,6 @@
 /* Partialy rewriten by Oleg I. Vdovikin for mmapped support of 
    for Alpha Processor Inc. UP-2000(+) boards */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
 #include <linux/module.h>

drivers/i2c/busses/i2c-frodo.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-frodo.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-frodo.c
@@ -12,7 +12,6 @@
  * version 2 as published by the Free Software Foundation.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>

drivers/i2c/busses/i2c-i801.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-i801.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-i801.c
@@ -40,7 +40,6 @@
 
 /* Note: we assume there can only be one I801, with one SMBus interface */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

drivers/i2c/busses/i2c-i810.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-i810.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-i810.c
@@ -34,7 +34,6 @@
    i815			1132           
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

drivers/i2c/busses/i2c-ibm_iic.h +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-ibm_iic.h linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-ibm_iic.h
@@ -22,7 +22,6 @@
 #ifndef __I2C_IBM_IIC_H_
 #define __I2C_IBM_IIC_H_
 
-#include <linux/config.h>
 #include <linux/i2c.h> 
 
 struct iic_regs {

drivers/i2c/busses/i2c-isa.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-isa.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-isa.c
@@ -24,7 +24,6 @@
    the SMBus and the ISA bus very much easier. See lm78.c for an example
    of this. */
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>

drivers/i2c/busses/i2c-ite.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-ite.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-ite.c
@@ -33,7 +33,6 @@
 /* With some changes from Ky?sti M?lkki <[email protected]> and even
    Frodo Looijaard <[email protected]> */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
 #include <linux/module.h>

drivers/i2c/busses/i2c-keywest.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-keywest.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-keywest.c
@@ -46,7 +46,6 @@
     sound driver to be happy
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>

drivers/i2c/busses/i2c-nforce2.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-nforce2.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-nforce2.c
@@ -37,7 +37,6 @@
 
 /* Note: we assume there can only be one nForce2, with two SMBus interfaces */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

drivers/i2c/busses/i2c-parport-light.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-parport-light.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-parport-light.c
@@ -24,7 +24,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  * ------------------------------------------------------------------------ */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

drivers/i2c/busses/i2c-parport.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-parport.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-parport.c
@@ -24,7 +24,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  * ------------------------------------------------------------------------ */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

drivers/i2c/busses/i2c-pca-isa.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-pca-isa.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-pca-isa.c
@@ -17,7 +17,6 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/ioport.h>
 #include <linux/module.h>

drivers/i2c/busses/i2c-piix4.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-piix4.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-piix4.c
@@ -28,7 +28,6 @@
    Note: we assume there can only be one device, with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/pci.h>

drivers/i2c/busses/i2c-prosavage.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-prosavage.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-prosavage.c
@@ -54,7 +54,6 @@
  *    (Additional documentation needed :(
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/pci.h>

drivers/i2c/busses/i2c-rpx.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-rpx.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-rpx.c
@@ -11,7 +11,6 @@
  * changed to eliminate RPXLite references.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

drivers/i2c/busses/i2c-s3c2410.c +1 -0

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-s3c2410.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-s3c2410.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>

drivers/i2c/busses/i2c-savage4.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-savage4.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-savage4.c
@@ -29,7 +29,6 @@
    it easier to add later.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

drivers/i2c/busses/i2c-sibyte.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-sibyte.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-sibyte.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/i2c-algo-sibyte.h>
 #include <asm/sibyte/sb1250_regs.h>

drivers/i2c/busses/i2c-sis5595.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-sis5595.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-sis5595.c
@@ -55,7 +55,6 @@
  * Add adapter resets
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>

drivers/i2c/busses/i2c-sis630.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-sis630.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-sis630.c
@@ -48,7 +48,6 @@
    Note: we assume there can only be one device, with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>

drivers/i2c/busses/i2c-sis96x.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-sis96x.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-sis96x.c
@@ -32,7 +32,6 @@
     We assume there can only be one SiS96x with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>

drivers/i2c/busses/i2c-stub.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-stub.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-stub.c
@@ -21,7 +21,6 @@
 
 #define DEBUG 1
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>

drivers/i2c/busses/i2c-via.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-via.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-via.c
@@ -21,7 +21,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>

drivers/i2c/busses/i2c-viapro.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-viapro.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-viapro.c
@@ -33,7 +33,6 @@
    Note: we assume there can only be one device, with one SMBus interface.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/pci.h>

drivers/i2c/busses/i2c-voodoo3.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/i2c-voodoo3.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/i2c-voodoo3.c
@@ -27,7 +27,6 @@
 /* This interfaces to the I2C bus of the Voodoo3 to gain access to
     the BT869 and possibly other I2C devices. */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>

drivers/i2c/busses/scx200_acb.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/busses/scx200_acb.c linux-2.6.12-rc2-config.h/drivers/i2c/busses/scx200_acb.c
@@ -24,7 +24,6 @@
 
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>

drivers/i2c/chips/adm1021.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/adm1021.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/adm1021.c
@@ -19,7 +19,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/adm1025.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/adm1025.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/adm1025.c
@@ -45,7 +45,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/adm1026.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/adm1026.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/adm1026.c
@@ -23,7 +23,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/ds1337.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/ds1337.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/ds1337.c
@@ -13,7 +13,6 @@
  * Driver for Dallas Semiconductor DS1337 real time clock chip
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/eeprom.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/eeprom.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/eeprom.c
@@ -26,7 +26,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>

drivers/i2c/chips/fscher.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/fscher.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/fscher.c
@@ -26,7 +26,6 @@
  *  and Philip Edelbrock <[email protected]>
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/gl518sm.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/gl518sm.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/gl518sm.c
@@ -36,7 +36,6 @@
  * 2004-01-31  Code review and approval. (Jean Delvare)
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/it87.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/it87.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/it87.c
@@ -31,7 +31,6 @@
     type at module load time.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/lm63.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/lm63.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/lm63.c
@@ -37,7 +37,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/lm75.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/lm75.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/lm75.c
@@ -18,7 +18,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/lm77.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/lm77.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/lm77.c
@@ -25,7 +25,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/lm78.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/lm78.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/lm78.c
@@ -18,7 +18,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/lm80.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/lm80.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/lm80.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/lm83.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/lm83.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/lm83.c
@@ -27,7 +27,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/lm85.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/lm85.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/lm85.c
@@ -23,7 +23,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/lm87.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/lm87.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/lm87.c
@@ -52,7 +52,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/lm90.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/lm90.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/lm90.c
@@ -70,7 +70,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/max1619.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/max1619.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/max1619.c
@@ -26,7 +26,6 @@
  */
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/pc87360.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/pc87360.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/pc87360.c
@@ -33,7 +33,6 @@
  *  the standard Super-I/O addresses is used (0x2E/0x2F or 0x4E/0x4F).
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/via686a.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/via686a.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/via686a.c
@@ -30,7 +30,6 @@
     Warning - only supports a single device.
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/pci.h>

drivers/i2c/chips/w83781d.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/w83781d.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/w83781d.c
@@ -35,7 +35,6 @@
 
 */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>

drivers/i2c/chips/w83l785ts.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/chips/w83l785ts.c linux-2.6.12-rc2-config.h/drivers/i2c/chips/w83l785ts.c
@@ -30,7 +30,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/init.h>

drivers/i2c/i2c-core.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/i2c-core.c linux-2.6.12-rc2-config.h/drivers/i2c/i2c-core.c
@@ -21,7 +21,6 @@
    All SMBus-related things are written by Frodo Looijaard <[email protected]>
    SMBus 2.0 support by Mark Studebaker <[email protected]>                */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>

drivers/i2c/i2c-dev.c +0 -1

diff -uprN linux-2.6.12-rc2-vanilla/drivers/i2c/i2c-dev.c linux-2.6.12-rc2-config.h/drivers/i2c/i2c-dev.c
@@ -29,7 +29,6 @@
 /* The devfs code is contributed by Philipp Matthias Hahn 
    <[email protected]> */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/fs.h>

Greg KH

Applied

2005-05-19 06:25 UTC #2 lore raw

PATCH 1/1 drivers/i2c/*: #include <linux/config.h> cleanup

In reply to Jean Delvare

Quoted 11 lines · Jean Delvare

Hi Alexey,
Quoted 4 lines
Files that don't use CONFIG_* stuff shouldn't include config.h Files that use CONFIG_* stuff should include config.h
It's that simple. ;-)
I agree. This won't change anything though, as all drivers include either device.h or module.h, which in turn include config.h. But you are still correct, so I approve your patch.

Quoted 7 lines

For completeness, I would propose the following on top of your own patch:
i2c bus drivers do not need to define DEBUG themselves, as the Kconfig system takes care of it.
Signed-off-by Jean Delvare <[email protected]>

Applied, thanks.

greg k-h

Greg KH

Applied

2005-05-19 06:25 UTC #3 lore raw

PATCH 1/1 drivers/i2c/*: #include <linux/config.h> cleanup

In reply to Jean Delvare

Quoted 6 lines · Alexey Dobriyan

Files that don't use CONFIG_* stuff shouldn't include config.h Files that use CONFIG_* stuff should include config.h
It's that simple. ;-)
Signed-off-by Alexey Dobriyan <[email protected]>

Applied, thanks.

greg k-h