Skip to content

Commit fced80c

Browse files
Russell KingRussell King
Russell King
authored and
Russell King
committed
[ARM] Convert asm/io.h to linux/io.h
Signed-off-by: Russell King <[email protected]>
1 parent 33fa9b1 commit fced80c

File tree

278 files changed

+282
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+282
-306
lines changed

‎arch/arm/common/gic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
#include <linux/list.h>
2828
#include <linux/smp.h>
2929
#include <linux/cpumask.h>
30+
#include <linux/io.h>
3031

3132
#include <asm/irq.h>
32-
#include <asm/io.h>
3333
#include <asm/mach/irq.h>
3434
#include <asm/hardware/gic.h>
3535

‎arch/arm/common/locomo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
#include <linux/platform_device.h>
2525
#include <linux/slab.h>
2626
#include <linux/spinlock.h>
27+
#include <linux/io.h>
2728

2829
#include <mach/hardware.h>
29-
#include <asm/io.h>
3030
#include <asm/irq.h>
3131
#include <asm/mach/irq.h>
3232

‎arch/arm/common/sa1111.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
#include <linux/spinlock.h>
2626
#include <linux/dma-mapping.h>
2727
#include <linux/clk.h>
28+
#include <linux/io.h>
2829

2930
#include <mach/hardware.h>
3031
#include <asm/mach-types.h>
31-
#include <asm/io.h>
3232
#include <asm/irq.h>
3333
#include <asm/mach/irq.h>
3434
#include <asm/sizes.h>

‎arch/arm/common/scoop.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/string.h>
1616
#include <linux/slab.h>
1717
#include <linux/platform_device.h>
18-
#include <asm/io.h>
18+
#include <linux/io.h>
1919
#include <asm/gpio.h>
2020
#include <asm/hardware/scoop.h>
2121

‎arch/arm/common/time-acorn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include <linux/init.h>
1818
#include <linux/interrupt.h>
1919
#include <linux/irq.h>
20+
#include <linux/io.h>
2021

2122
#include <mach/hardware.h>
22-
#include <asm/io.h>
2323
#include <asm/hardware/ioc.h>
2424

2525
#include <asm/mach/time.h>

‎arch/arm/common/uengine.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#include <linux/slab.h>
1717
#include <linux/module.h>
1818
#include <linux/string.h>
19+
#include <linux/io.h>
1920
#include <mach/hardware.h>
2021
#include <asm/hardware/uengine.h>
21-
#include <asm/io.h>
2222

2323
#if defined(CONFIG_ARCH_IXP2000)
2424
#define IXP_UENGINE_CSR_VIRT_BASE IXP2000_UENGINE_CSR_VIRT_BASE

‎arch/arm/common/via82c505.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include <linux/mm.h>
55
#include <linux/init.h>
66
#include <linux/ioport.h>
7+
#include <linux/io.h>
78

8-
#include <asm/io.h>
99
#include <asm/system.h>
1010

1111
#include <asm/mach/pci.h>

‎arch/arm/common/vic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
*/
2121
#include <linux/init.h>
2222
#include <linux/list.h>
23+
#include <linux/io.h>
2324

24-
#include <asm/io.h>
2525
#include <asm/mach/irq.h>
2626
#include <asm/hardware/vic.h>
2727

‎arch/arm/include/asm/mc146818rtc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#ifndef _ASM_MC146818RTC_H
55
#define _ASM_MC146818RTC_H
66

7+
#include <linux/io.h>
78
#include <mach/irqs.h>
8-
#include <asm/io.h>
99

1010
#ifndef RTC_PORT
1111
#define RTC_PORT(x) (0x70 + (x))

‎arch/arm/include/asm/vga.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#ifndef ASMARM_VGA_H
22
#define ASMARM_VGA_H
33

4+
#include <linux/io.h>
45
#include <mach/hardware.h>
5-
#include <asm/io.h>
66

77
#define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x))
88

‎arch/arm/kernel/armksyms.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#include <linux/in6.h>
1515
#include <linux/syscalls.h>
1616
#include <linux/uaccess.h>
17+
#include <linux/io.h>
1718

1819
#include <asm/checksum.h>
19-
#include <asm/io.h>
2020
#include <asm/system.h>
2121
#include <asm/ftrace.h>
2222

‎arch/arm/kernel/bios32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include <linux/pci.h>
1111
#include <linux/slab.h>
1212
#include <linux/init.h>
13+
#include <linux/io.h>
1314

14-
#include <asm/io.h>
1515
#include <asm/mach-types.h>
1616
#include <asm/mach/pci.h>
1717

‎arch/arm/kernel/crunch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include <linux/signal.h>
1616
#include <linux/sched.h>
1717
#include <linux/init.h>
18+
#include <linux/io.h>
1819
#include <mach/ep93xx-regs.h>
1920
#include <asm/thread_notify.h>
20-
#include <asm/io.h>
2121

2222
struct crunch_state *crunch_owner;
2323

‎arch/arm/kernel/dma-isa.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
#include <linux/ioport.h>
2020
#include <linux/init.h>
2121
#include <linux/dma-mapping.h>
22+
#include <linux/io.h>
2223

2324
#include <asm/dma.h>
24-
#include <asm/io.h>
25-
2625
#include <asm/mach/dma.h>
2726

2827
#define ISA_DMA_MODE_READ 0x44

‎arch/arm/kernel/io.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include <linux/module.h>
22
#include <linux/types.h>
3-
4-
#include <asm/io.h>
3+
#include <linux/io.h>
54

65
/*
76
* Copy data from IO memory space to "real" memory space.

‎arch/arm/kernel/machine_kexec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
#include <linux/kexec.h>
77
#include <linux/delay.h>
88
#include <linux/reboot.h>
9+
#include <linux/io.h>
910
#include <asm/pgtable.h>
1011
#include <asm/pgalloc.h>
1112
#include <asm/mmu_context.h>
12-
#include <asm/io.h>
1313
#include <asm/cacheflush.h>
1414
#include <asm/mach-types.h>
1515

‎arch/arm/kernel/traps.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <asm/system.h>
2727
#include <asm/unistd.h>
2828
#include <asm/traps.h>
29-
#include <asm/io.h>
3029

3130
#include "ptrace.h"
3231
#include "signal.h"

‎arch/arm/kernel/xscale-cp0.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include <linux/signal.h>
1515
#include <linux/sched.h>
1616
#include <linux/init.h>
17+
#include <linux/io.h>
1718
#include <asm/thread_notify.h>
18-
#include <asm/io.h>
1919

2020
static inline void dsp_save_state(u32 *state)
2121
{

‎arch/arm/mach-at91/at91x40_time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include <linux/interrupt.h>
2424
#include <linux/irq.h>
2525
#include <linux/time.h>
26+
#include <linux/io.h>
2627
#include <mach/hardware.h>
27-
#include <asm/io.h>
2828
#include <asm/mach/time.h>
2929
#include <mach/at91_tc.h>
3030

‎arch/arm/mach-at91/clock.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
#include <linux/spinlock.h>
2323
#include <linux/delay.h>
2424
#include <linux/clk.h>
25-
26-
#include <asm/io.h>
25+
#include <linux/io.h>
2726

2827
#include <mach/hardware.h>
2928
#include <mach/at91_pmc.h>

‎arch/arm/mach-at91/gpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include <linux/kernel.h>
1919
#include <linux/list.h>
2020
#include <linux/module.h>
21+
#include <linux/io.h>
2122

22-
#include <asm/io.h>
2323
#include <mach/hardware.h>
2424
#include <mach/at91_pio.h>
2525
#include <mach/gpio.h>

‎arch/arm/mach-at91/include/mach/irqs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#ifndef __ASM_ARCH_IRQS_H
2222
#define __ASM_ARCH_IRQS_H
2323

24-
#include <asm/io.h>
24+
#include <linux/io.h>
2525
#include <mach/at91_aic.h>
2626

2727
#define NR_AIC_IRQS 32

‎arch/arm/mach-at91/include/mach/uncompress.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#ifndef __ASM_ARCH_UNCOMPRESS_H
2222
#define __ASM_ARCH_UNCOMPRESS_H
2323

24-
#include <asm/io.h>
24+
#include <linux/io.h>
2525
#include <linux/atmel_serial.h>
2626

2727
#if defined(CONFIG_AT91_EARLY_DBGU)

‎arch/arm/mach-at91/pm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include <linux/sysfs.h>
1818
#include <linux/module.h>
1919
#include <linux/platform_device.h>
20+
#include <linux/io.h>
2021

21-
#include <asm/io.h>
2222
#include <asm/irq.h>
2323
#include <asm/atomic.h>
2424
#include <asm/mach/time.h>

‎arch/arm/mach-clps711x/autcpu12.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#include <linux/types.h>
2323
#include <linux/string.h>
2424
#include <linux/mm.h>
25+
#include <linux/io.h>
2526

2627
#include <mach/hardware.h>
2728
#include <asm/sizes.h>
28-
#include <asm/io.h>
2929
#include <asm/setup.h>
3030
#include <asm/mach-types.h>
3131
#include <asm/mach/arch.h>

‎arch/arm/mach-clps711x/cdb89712.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include <linux/types.h>
2323
#include <linux/string.h>
2424
#include <linux/mm.h>
25+
#include <linux/io.h>
2526

2627
#include <mach/hardware.h>
27-
#include <asm/io.h>
2828
#include <asm/pgtable.h>
2929
#include <asm/page.h>
3030
#include <asm/setup.h>

‎arch/arm/mach-clps711x/include/mach/system.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#ifndef __ASM_ARCH_SYSTEM_H
2121
#define __ASM_ARCH_SYSTEM_H
2222

23+
#include <linux/io.h>
2324
#include <mach/hardware.h>
2425
#include <asm/hardware/clps7111.h>
25-
#include <asm/io.h>
2626

2727
static inline void arch_idle(void)
2828
{

‎arch/arm/mach-clps711x/irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
*/
2020
#include <linux/init.h>
2121
#include <linux/list.h>
22+
#include <linux/io.h>
2223

2324
#include <asm/mach/irq.h>
2425
#include <mach/hardware.h>
25-
#include <asm/io.h>
2626
#include <asm/irq.h>
2727

2828
#include <asm/hardware/clps7111.h>

‎arch/arm/mach-clps711x/p720t-leds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
*/
2222
#include <linux/kernel.h>
2323
#include <linux/init.h>
24+
#include <linux/io.h>
2425

2526
#include <mach/hardware.h>
26-
#include <asm/io.h>
2727
#include <asm/leds.h>
2828
#include <asm/system.h>
2929
#include <asm/mach-types.h>

‎arch/arm/mach-clps711x/p720t.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include <linux/types.h>
2323
#include <linux/string.h>
2424
#include <linux/mm.h>
25+
#include <linux/io.h>
2526

2627
#include <mach/hardware.h>
27-
#include <asm/io.h>
2828
#include <asm/pgtable.h>
2929
#include <asm/page.h>
3030
#include <asm/setup.h>

‎arch/arm/mach-clps711x/time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
#include <linux/interrupt.h>
2222
#include <linux/irq.h>
2323
#include <linux/sched.h>
24+
#include <linux/io.h>
2425

2526
#include <mach/hardware.h>
2627
#include <asm/irq.h>
2728
#include <asm/leds.h>
28-
#include <asm/io.h>
2929
#include <asm/hardware/clps7111.h>
3030

3131
#include <asm/mach/time.h>

‎arch/arm/mach-clps7500/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/init.h>
1616
#include <linux/device.h>
1717
#include <linux/serial_8250.h>
18+
#include <linux/io.h>
1819

1920
#include <asm/mach/arch.h>
2021
#include <asm/mach/map.h>
@@ -23,7 +24,6 @@
2324

2425
#include <mach/hardware.h>
2526
#include <asm/hardware/iomd.h>
26-
#include <asm/io.h>
2727
#include <asm/irq.h>
2828
#include <asm/mach-types.h>
2929

‎arch/arm/mach-clps7500/include/mach/irq.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
* 11-08-1999 PJB Created ARM7500 version, derived from RiscPC code
1111
*/
1212

13+
#include <linux/io.h>
1314
#include <asm/hardware/iomd.h>
14-
#include <asm/io.h>
1515

1616
static inline int fixup_irq(unsigned int irq)
1717
{

‎arch/arm/mach-clps7500/include/mach/system.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#ifndef __ASM_ARCH_SYSTEM_H
77
#define __ASM_ARCH_SYSTEM_H
88

9+
#include <linux/io.h>
910
#include <asm/hardware/iomd.h>
10-
#include <asm/io.h>
1111

1212
static inline void arch_idle(void)
1313
{

‎arch/arm/mach-davinci/board-evm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#include <linux/mtd/mtd.h>
1717
#include <linux/mtd/partitions.h>
1818
#include <linux/mtd/physmap.h>
19+
#include <linux/io.h>
1920

2021
#include <asm/setup.h>
21-
#include <asm/io.h>
2222
#include <asm/mach-types.h>
2323
#include <mach/hardware.h>
2424

‎arch/arm/mach-davinci/clock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#include <linux/err.h>
1717
#include <linux/mutex.h>
1818
#include <linux/platform_device.h>
19+
#include <linux/io.h>
1920

2021
#include <mach/hardware.h>
21-
#include <asm/io.h>
2222

2323
#include <mach/psc.h>
2424
#include "clock.h"

‎arch/arm/mach-davinci/id.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
#include <linux/module.h>
1414
#include <linux/kernel.h>
1515
#include <linux/init.h>
16-
17-
#include <asm/io.h>
16+
#include <linux/io.h>
1817

1918
#define JTAG_ID_BASE 0x01c40028
2019

0 commit comments

Comments
 (0)