tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

i2c: Use <linux/io.h> instead of <asm/io.h>

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>

authored by

H Hartley Sweeten and committed by
Jean Delvare 21782180 2086ca48

+32 -37
+1 -1
drivers/i2c/busses/i2c-ali1535.c
··· 60 60 #include <linux/i2c.h> 61 61 #include <linux/init.h> 62 62 #include <linux/acpi.h> 63 - #include <asm/io.h> 63 + #include <linux/io.h> 64 64 65 65 66 66 /* ALI1535 SMBus address offsets */
+1 -1
drivers/i2c/busses/i2c-ali15x3.c
··· 67 67 #include <linux/i2c.h> 68 68 #include <linux/init.h> 69 69 #include <linux/acpi.h> 70 - #include <asm/io.h> 70 + #include <linux/io.h> 71 71 72 72 /* ALI15X3 SMBus address offsets */ 73 73 #define SMBHSTSTS (0 + ali15x3_smba)
+1 -1
drivers/i2c/busses/i2c-amd756.c
··· 43 43 #include <linux/i2c.h> 44 44 #include <linux/init.h> 45 45 #include <linux/acpi.h> 46 - #include <asm/io.h> 46 + #include <linux/io.h> 47 47 48 48 /* AMD756 SMBus address offsets */ 49 49 #define SMB_ADDR_OFFSET 0xE0
+1 -1
drivers/i2c/busses/i2c-amd8111.c
··· 18 18 #include <linux/delay.h> 19 19 #include <linux/acpi.h> 20 20 #include <linux/slab.h> 21 - #include <asm/io.h> 21 + #include <linux/io.h> 22 22 23 23 MODULE_LICENSE("GPL"); 24 24 MODULE_AUTHOR ("Vojtech Pavlik <vojtech@suse.cz>");
+1 -2
drivers/i2c/busses/i2c-at91.c
··· 23 23 #include <linux/init.h> 24 24 #include <linux/clk.h> 25 25 #include <linux/platform_device.h> 26 - 27 - #include <asm/io.h> 26 + #include <linux/io.h> 28 27 29 28 #include <mach/at91_twi.h> 30 29 #include <mach/board.h>
+1 -1
drivers/i2c/busses/i2c-elektor.c
··· 37 37 #include <linux/isa.h> 38 38 #include <linux/i2c.h> 39 39 #include <linux/i2c-algo-pcf.h> 40 + #include <linux/io.h> 40 41 41 - #include <asm/io.h> 42 42 #include <asm/irq.h> 43 43 44 44 #include "../algos/i2c-algo-pcf.h"
+1 -1
drivers/i2c/busses/i2c-hydra.c
··· 28 28 #include <linux/i2c.h> 29 29 #include <linux/i2c-algo-bit.h> 30 30 #include <linux/init.h> 31 - #include <asm/io.h> 31 + #include <linux/io.h> 32 32 #include <asm/hydra.h> 33 33 34 34
+1 -1
drivers/i2c/busses/i2c-ibm_iic.c
··· 39 39 #include <linux/init.h> 40 40 #include <linux/interrupt.h> 41 41 #include <asm/irq.h> 42 - #include <asm/io.h> 42 + #include <linux/io.h> 43 43 #include <linux/i2c.h> 44 44 #include <linux/i2c-id.h> 45 45 #include <linux/of_platform.h>
+1 -2
drivers/i2c/busses/i2c-iop3xx.c
··· 38 38 #include <linux/errno.h> 39 39 #include <linux/platform_device.h> 40 40 #include <linux/i2c.h> 41 - 42 - #include <asm/io.h> 41 + #include <linux/io.h> 43 42 44 43 #include "i2c-iop3xx.h" 45 44
+1 -2
drivers/i2c/busses/i2c-mv64xxx.c
··· 17 17 #include <linux/interrupt.h> 18 18 #include <linux/mv643xx_i2c.h> 19 19 #include <linux/platform_device.h> 20 - 21 - #include <asm/io.h> 20 + #include <linux/io.h> 22 21 23 22 /* Register defines */ 24 23 #define MV64XXX_I2C_REG_SLAVE_ADDR 0x00
+1 -1
drivers/i2c/busses/i2c-nforce2.c
··· 57 57 #include <linux/dmi.h> 58 58 #include <linux/acpi.h> 59 59 #include <linux/slab.h> 60 - #include <asm/io.h> 60 + #include <linux/io.h> 61 61 62 62 MODULE_LICENSE("GPL"); 63 63 MODULE_AUTHOR ("Hans-Frieder Vogt <hfvogt@gmx.net>");
+1 -1
drivers/i2c/busses/i2c-ocores.c
··· 19 19 #include <linux/wait.h> 20 20 #include <linux/i2c-ocores.h> 21 21 #include <linux/slab.h> 22 - #include <asm/io.h> 22 + #include <linux/io.h> 23 23 24 24 struct ocores_i2c { 25 25 void __iomem *base;
+1 -1
drivers/i2c/busses/i2c-parport-light.c
··· 33 33 #include <linux/i2c.h> 34 34 #include <linux/i2c-algo-bit.h> 35 35 #include <linux/i2c-smbus.h> 36 - #include <asm/io.h> 36 + #include <linux/io.h> 37 37 #include "i2c-parport.h" 38 38 39 39 #define DEFAULT_BASE 0x378
+1 -1
drivers/i2c/busses/i2c-pasemi.c
··· 25 25 #include <linux/i2c.h> 26 26 #include <linux/delay.h> 27 27 #include <linux/slab.h> 28 - #include <asm/io.h> 28 + #include <linux/io.h> 29 29 30 30 static struct pci_driver pasemi_smb_driver; 31 31
+1 -1
drivers/i2c/busses/i2c-pca-isa.c
··· 30 30 #include <linux/isa.h> 31 31 #include <linux/i2c.h> 32 32 #include <linux/i2c-algo-pca.h> 33 + #include <linux/io.h> 33 34 34 - #include <asm/io.h> 35 35 #include <asm/irq.h> 36 36 37 37 #define DRIVER "i2c-pca-isa"
+1 -1
drivers/i2c/busses/i2c-pca-platform.c
··· 23 23 #include <linux/i2c-algo-pca.h> 24 24 #include <linux/i2c-pca-platform.h> 25 25 #include <linux/gpio.h> 26 + #include <linux/io.h> 26 27 27 28 #include <asm/irq.h> 28 - #include <asm/io.h> 29 29 30 30 struct i2c_pca_pf_data { 31 31 void __iomem *reg_base;
+1 -1
drivers/i2c/busses/i2c-piix4.c
··· 39 39 #include <linux/init.h> 40 40 #include <linux/dmi.h> 41 41 #include <linux/acpi.h> 42 - #include <asm/io.h> 42 + #include <linux/io.h> 43 43 44 44 45 45 /* PIIX4 SMBus address offsets */
+1 -1
drivers/i2c/busses/i2c-pmcmsp.c
··· 33 33 #include <linux/completion.h> 34 34 #include <linux/mutex.h> 35 35 #include <linux/delay.h> 36 - #include <asm/io.h> 36 + #include <linux/io.h> 37 37 38 38 #define DRV_NAME "pmcmsptwi" 39 39
+1 -1
drivers/i2c/busses/i2c-pxa.c
··· 34 34 #include <linux/err.h> 35 35 #include <linux/clk.h> 36 36 #include <linux/slab.h> 37 + #include <linux/io.h> 37 38 38 39 #include <asm/irq.h> 39 - #include <asm/io.h> 40 40 #include <plat/i2c.h> 41 41 42 42 /*
+1 -1
drivers/i2c/busses/i2c-s3c2410.c
··· 35 35 #include <linux/clk.h> 36 36 #include <linux/cpufreq.h> 37 37 #include <linux/slab.h> 38 + #include <linux/io.h> 38 39 39 40 #include <asm/irq.h> 40 - #include <asm/io.h> 41 41 42 42 #include <plat/regs-iic.h> 43 43 #include <plat/iic.h>
+1 -1
drivers/i2c/busses/i2c-s6000.c
··· 36 36 #include <linux/completion.h> 37 37 #include <linux/interrupt.h> 38 38 #include <linux/platform_device.h> 39 + #include <linux/io.h> 39 40 40 - #include <asm/io.h> 41 41 #include "i2c-s6000.h" 42 42 43 43 #define DRV_NAME "i2c-s6000"
+1 -1
drivers/i2c/busses/i2c-sh7760.c
··· 16 16 #include <linux/ioport.h> 17 17 #include <linux/platform_device.h> 18 18 #include <linux/slab.h> 19 + #include <linux/io.h> 19 20 20 21 #include <asm/clock.h> 21 22 #include <asm/i2c-sh7760.h> 22 - #include <asm/io.h> 23 23 24 24 /* register offsets */ 25 25 #define I2CSCR 0x0 /* slave ctrl */
+1 -1
drivers/i2c/busses/i2c-sibyte.c
··· 22 22 #include <linux/module.h> 23 23 #include <linux/init.h> 24 24 #include <linux/i2c.h> 25 - #include <asm/io.h> 25 + #include <linux/io.h> 26 26 #include <asm/sibyte/sb1250_regs.h> 27 27 #include <asm/sibyte/sb1250_smbus.h> 28 28
+1 -2
drivers/i2c/busses/i2c-simtec.c
··· 24 24 #include <linux/delay.h> 25 25 #include <linux/platform_device.h> 26 26 #include <linux/slab.h> 27 + #include <linux/io.h> 27 28 28 29 #include <linux/i2c.h> 29 30 #include <linux/i2c-algo-bit.h> 30 - 31 - #include <asm/io.h> 32 31 33 32 struct simtec_i2c_data { 34 33 struct resource *ioarea;
+1 -1
drivers/i2c/busses/i2c-sis5595.c
··· 61 61 #include <linux/init.h> 62 62 #include <linux/i2c.h> 63 63 #include <linux/acpi.h> 64 - #include <asm/io.h> 64 + #include <linux/io.h> 65 65 66 66 static int blacklist[] = { 67 67 PCI_DEVICE_ID_SI_540,
+1 -1
drivers/i2c/busses/i2c-sis630.c
··· 53 53 #include <linux/init.h> 54 54 #include <linux/i2c.h> 55 55 #include <linux/acpi.h> 56 - #include <asm/io.h> 56 + #include <linux/io.h> 57 57 58 58 /* SIS630 SMBus registers */ 59 59 #define SMB_STS 0x80 /* status */
+1 -1
drivers/i2c/busses/i2c-sis96x.c
··· 38 38 #include <linux/i2c.h> 39 39 #include <linux/init.h> 40 40 #include <linux/acpi.h> 41 - #include <asm/io.h> 41 + #include <linux/io.h> 42 42 43 43 /* base address register in PCI config space */ 44 44 #define SIS96x_BAR 0x04
+1 -2
drivers/i2c/busses/i2c-versatile.c
··· 15 15 #include <linux/init.h> 16 16 #include <linux/platform_device.h> 17 17 #include <linux/slab.h> 18 - 19 - #include <asm/io.h> 18 + #include <linux/io.h> 20 19 21 20 #define I2C_CONTROL 0x00 22 21 #define I2C_CONTROLS 0x00
+1 -1
drivers/i2c/busses/i2c-via.c
··· 25 25 #include <linux/init.h> 26 26 #include <linux/i2c.h> 27 27 #include <linux/i2c-algo-bit.h> 28 - #include <asm/io.h> 28 + #include <linux/io.h> 29 29 30 30 /* Power management registers */ 31 31 #define PM_CFG_REVID 0x08 /* silicon revision code */
+1 -1
drivers/i2c/busses/i2c-viapro.c
··· 51 51 #include <linux/i2c.h> 52 52 #include <linux/init.h> 53 53 #include <linux/acpi.h> 54 - #include <asm/io.h> 54 + #include <linux/io.h> 55 55 56 56 static struct pci_dev *vt596_pdev; 57 57
+1 -1
drivers/i2c/busses/scx200_acb.c
··· 32 32 #include <linux/delay.h> 33 33 #include <linux/mutex.h> 34 34 #include <linux/slab.h> 35 - #include <asm/io.h> 35 + #include <linux/io.h> 36 36 37 37 #include <linux/scx200.h> 38 38
+1 -1
drivers/i2c/busses/scx200_i2c.c
··· 27 27 #include <linux/init.h> 28 28 #include <linux/i2c.h> 29 29 #include <linux/i2c-algo-bit.h> 30 - #include <asm/io.h> 30 + #include <linux/io.h> 31 31 32 32 #include <linux/scx200_gpio.h> 33 33