i2c: Use <linux/io.h> instead of <asm/io.h>
authorH Hartley Sweeten <hartleys@visionengravers.com>
Fri, 21 May 2010 16:41:01 +0000 (18:41 +0200)
committerJean Delvare <khali@linux-fr.org>
Fri, 21 May 2010 16:41:01 +0000 (18:41 +0200)
As warned by checkpatch.pl, <linux/io.h> should be used instead of
<asm/io.h>.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
32 files changed:
drivers/i2c/busses/i2c-ali1535.c
drivers/i2c/busses/i2c-ali15x3.c
drivers/i2c/busses/i2c-amd756.c
drivers/i2c/busses/i2c-amd8111.c
drivers/i2c/busses/i2c-at91.c
drivers/i2c/busses/i2c-elektor.c
drivers/i2c/busses/i2c-hydra.c
drivers/i2c/busses/i2c-ibm_iic.c
drivers/i2c/busses/i2c-iop3xx.c
drivers/i2c/busses/i2c-mv64xxx.c
drivers/i2c/busses/i2c-nforce2.c
drivers/i2c/busses/i2c-ocores.c
drivers/i2c/busses/i2c-parport-light.c
drivers/i2c/busses/i2c-pasemi.c
drivers/i2c/busses/i2c-pca-isa.c
drivers/i2c/busses/i2c-pca-platform.c
drivers/i2c/busses/i2c-piix4.c
drivers/i2c/busses/i2c-pmcmsp.c
drivers/i2c/busses/i2c-pxa.c
drivers/i2c/busses/i2c-s3c2410.c
drivers/i2c/busses/i2c-s6000.c
drivers/i2c/busses/i2c-sh7760.c
drivers/i2c/busses/i2c-sibyte.c
drivers/i2c/busses/i2c-simtec.c
drivers/i2c/busses/i2c-sis5595.c
drivers/i2c/busses/i2c-sis630.c
drivers/i2c/busses/i2c-sis96x.c
drivers/i2c/busses/i2c-versatile.c
drivers/i2c/busses/i2c-via.c
drivers/i2c/busses/i2c-viapro.c
drivers/i2c/busses/scx200_acb.c
drivers/i2c/busses/scx200_i2c.c

index bd8f1e4d9e6ccd6b91c5bfd71885f933808253bc..906a3ca50db6c0d49bcb6f5ad85824c15d6ee87e 100644 (file)
@@ -60,7 +60,7 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 
 /* ALI1535 SMBus address offsets */
index 659f63f5e4af2366d50988b3d756cc6e0bf21d5b..b14f6d68221de37d2310c4279afd306bc8d0ec08 100644 (file)
@@ -67,7 +67,7 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 /* ALI15X3 SMBus address offsets */
 #define SMBHSTSTS      (0 + ali15x3_smba)
index c5a9fa488e7f227df07af43614209f1330e73f55..03bcd07c4697721b35810bf0b379465baffd23f2 100644 (file)
@@ -43,7 +43,7 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 /* AMD756 SMBus address offsets */
 #define SMB_ADDR_OFFSET                0xE0
index 2fbef27b6cd60f6af5245e41fd42591b3d3f12ca..af1e5e254b7b4193afde1b75e3ca98f3cd37ad6f 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/delay.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR ("Vojtech Pavlik <vojtech@suse.cz>");
index 06e1ecb4919f6258c157358183604accb109482c..305c07504f7ebe055f2bfd5468e75a8e0ba31790 100644 (file)
@@ -23,8 +23,7 @@
 #include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/platform_device.h>
-
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include <mach/at91_twi.h>
 #include <mach/board.h>
index 612255614a66d763527c32cf6610a4fb016bb1b3..e5b1a3bf5b8071ce034de739f25845c99aa332ba 100644 (file)
@@ -37,8 +37,8 @@
 #include <linux/isa.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-pcf.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/irq.h>
 
 #include "../algos/i2c-algo-pcf.h"
index c767295ad1fba7d413738c45526ac2b76d82fd44..9ff1695d845862ec77a4cf8ab1e5db7486ddc459 100644 (file)
@@ -28,7 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/init.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/hydra.h>
 
 
index 2bef534cbff13ad140939d9e5e2cbe4384b09059..f8ccc0fe95a83761f0e8c579450f0d542abde641 100644 (file)
@@ -39,7 +39,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <asm/irq.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/i2c.h>
 #include <linux/i2c-id.h>
 #include <linux/of_platform.h>
index 5901707fc66accbef77b71be68df99da24b1183d..112c61f7b8cde23e727cc1d2eaa84eba9b028861 100644 (file)
@@ -38,8 +38,7 @@
 #include <linux/errno.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include "i2c-iop3xx.h"
 
index 3623a44990849987bc872480122bc1d987e2b004..16242063144fa5a82d61e5c3d4f105f46963b783 100644 (file)
@@ -17,8 +17,7 @@
 #include <linux/interrupt.h>
 #include <linux/mv643xx_i2c.h>
 #include <linux/platform_device.h>
-
-#include <asm/io.h>
+#include <linux/io.h>
 
 /* Register defines */
 #define        MV64XXX_I2C_REG_SLAVE_ADDR                      0x00
index 4a48dd4ef7870cb7d9789ee34d12f13ca6f5b3db..b23dfe9f27870dd46e628d780195512d7d28f560 100644 (file)
@@ -57,7 +57,7 @@
 #include <linux/dmi.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR ("Hans-Frieder Vogt <hfvogt@gmx.net>");
index b4ed4ca802ed97d9f829adcc60b850548582f50f..0070371b29f3c0e6f05f329ca0233cc8096a1c55 100644 (file)
@@ -19,7 +19,7 @@
 #include <linux/wait.h>
 #include <linux/i2c-ocores.h>
 #include <linux/slab.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 struct ocores_i2c {
        void __iomem *base;
index 5f41ec0f72d23c2d090869005597a93132991e55..fc5fbd1012c98af5a8b458a1b058ea5c2374e4e1 100644 (file)
@@ -33,7 +33,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/i2c-smbus.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include "i2c-parport.h"
 
 #define DEFAULT_BASE 0x378
index d3d4a4b43a1d015527f565027b761291711d8f24..4174101660c91430782620ce0df8895c1d3c734a 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 static struct pci_driver pasemi_smb_driver;
 
index f7346a9bd95f21134fcdfd20508bc3317f75bdbf..bbd77603a4173b8f29aa1353ef1e47376c594196 100644 (file)
@@ -30,8 +30,8 @@
 #include <linux/isa.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-pca.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/irq.h>
 
 #define DRIVER "i2c-pca-isa"
index 5b2213df5ed039dfb008c0cdf3aa6d2019543630..ef5c78487eb779c36fd5b98f3fd8d0727c34494e 100644 (file)
@@ -23,9 +23,9 @@
 #include <linux/i2c-algo-pca.h>
 #include <linux/i2c-pca-platform.h>
 #include <linux/gpio.h>
+#include <linux/io.h>
 
 #include <asm/irq.h>
-#include <asm/io.h>
 
 struct i2c_pca_pf_data {
        void __iomem                    *reg_base;
index ee9da6fcf69a0a4acabadaa5d9a96516b5483c0f..6d14ac2e3c41b80982b1c5666cbca554d7c5facb 100644 (file)
@@ -39,7 +39,7 @@
 #include <linux/init.h>
 #include <linux/dmi.h>
 #include <linux/acpi.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 
 /* PIIX4 SMBus address offsets */
index 7b57d5f267e1c28847a1bdb0db530a798ef9ab9a..dfa7ae9c1b8ee8374cf6eaa0f791defc58c98206 100644 (file)
@@ -33,7 +33,7 @@
 #include <linux/completion.h>
 #include <linux/mutex.h>
 #include <linux/delay.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #define DRV_NAME       "pmcmsptwi"
 
index fbde6f614059d127c312595bbdf4197a21d6e0c4..020ff23d762f4c116eb208cc18e735c6cf69c6d4 100644 (file)
@@ -34,9 +34,9 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 
 #include <asm/irq.h>
-#include <asm/io.h>
 #include <plat/i2c.h>
 
 /*
index ec3256cce91e08a485d475e71ac1b61e408fd52e..72902e0bbfa79a48caaf2193420d4b8712af1e18 100644 (file)
@@ -35,9 +35,9 @@
 #include <linux/clk.h>
 #include <linux/cpufreq.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 
 #include <asm/irq.h>
-#include <asm/io.h>
 
 #include <plat/regs-iic.h>
 #include <plat/iic.h>
index c91359f4965c0e3db5055c5cf44cf389fe0769e0..cadc0216e02f9837448a31211453a8c8e9bf76ca 100644 (file)
@@ -36,8 +36,8 @@
 #include <linux/completion.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include "i2c-s6000.h"
 
 #define DRV_NAME "i2c-s6000"
index b9680f50f541b76824bbe2881c60b2d4e6486f03..4f93da31d3ad8c4dd9b6f6d719a6ea1571b00819 100644 (file)
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 
 #include <asm/clock.h>
 #include <asm/i2c-sh7760.h>
-#include <asm/io.h>
 
 /* register offsets */
 #define I2CSCR         0x0             /* slave ctrl           */
index 98b1ec4891597b3db0cdc02a2d2396d348965b0c..3d76a188e42fd5dfe1605a00399e787cdaf961a4 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/sibyte/sb1250_regs.h>
 #include <asm/sibyte/sb1250_smbus.h>
 
index 78b06107342cde80bdb33c4b25ecdc97dfebb38e..2fc08fbf67a223d6e7bfb26a0cf0d50ff40f821d 100644 (file)
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/io.h>
 
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 
-#include <asm/io.h>
-
 struct simtec_i2c_data {
        struct resource         *ioarea;
        void __iomem            *reg;
index 55a71370c79b1fe780b3d0324db544989195f1c3..437586611d4a18819f110698d7618f7dde9471c3 100644 (file)
@@ -61,7 +61,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/acpi.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 static int blacklist[] = {
        PCI_DEVICE_ID_SI_540,
index 2309c7f1bde2da537baff92c2a5dad2bc59ec734..e6f539e26f65fb97918e132164d45b80ce4a0113 100644 (file)
@@ -53,7 +53,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/acpi.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 /* SIS630 SMBus registers */
 #define SMB_STS                        0x80    /* status */
index d43d8f8943ddcd2ea3f683fe1776b20c40d68b6c..86837f0c4cb92efc4e1582dc2cfa2e89f68d936a 100644 (file)
@@ -38,7 +38,7 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 /* base address register in PCI config space */
 #define SIS96x_BAR 0x04
index 5c473833d948e3a4e5428f0fb8fb33f2ad894dfc..60556012312f27145745d62ee86f37f63107f021 100644 (file)
@@ -15,8 +15,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-
-#include <asm/io.h>
+#include <linux/io.h>
 
 #define I2C_CONTROL    0x00
 #define I2C_CONTROLS   0x00
index de78283bddbeab33ab43b0a7fcce39254dd942cd..7799fe5bda885d3513a6e7b34f5686ae979d8456 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 /* Power management registers */
 #define PM_CFG_REVID   0x08    /* silicon revision code */
index d57292e5dae01fa8f6e313d1d39221457b942206..4c6fff5f330dd5bd5beea636943e76390b55862b 100644 (file)
@@ -51,7 +51,7 @@
 #include <linux/i2c.h>
 #include <linux/init.h>
 #include <linux/acpi.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 static struct pci_dev *vt596_pdev;
 
index 36bb61170df35cdee41e70c70094b58357892f9d..4cb4bb009950ca98aec8aedf901629924cadff72 100644 (file)
@@ -32,7 +32,7 @@
 #include <linux/delay.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include <linux/scx200.h>
 
index 42df0eca43d5229b1fd88624e3fee4c369f0f462..7ee0d502ceab51da27b5358f5e1d2f1725447ae7 100644 (file)
@@ -27,7 +27,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include <linux/scx200_gpio.h>