aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2014-04-07 18:39:19 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-07 19:36:11 -0400
commitce816fa88cca083c47ab9000b2138a83043a78be (patch)
treefcdd6e68adb239187eb833722261ff348610809b
parent6d08a2567c0b9103c3ff946df17ad4be9a917e2f (diff)
Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP
If the renamed symbol is defined lib/iomap.c implements ioport_map and ioport_unmap and currently (nearly) all platforms define the port accessor functions outb/inb and friend unconditionally. So HAS_IOPORT_MAP is the better name for this. Consequently NO_IOPORT is renamed to NO_IOPORT_MAP. The motivation for this change is to reintroduce a symbol HAS_IOPORT that signals if outb/int et al are available. I will address that at least one merge window later though to keep surprises to a minimum and catch new introductions of (HAS|NO)_IOPORT. The changes in this commit were done using: $ git grep -l -E '(NO|HAS)_IOPORT' | xargs perl -p -i -e 's/\b((?:CONFIG_)?(?:NO|HAS)_IOPORT)\b/$1_MAP/' Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat
-rw-r--r--arch/arc/Kconfig2
-rw-r--r--arch/arm/Kconfig12
-rw-r--r--arch/arm/mach-picoxcell/Kconfig2
-rw-r--r--arch/arm/mach-prima2/Kconfig2
-rw-r--r--arch/arm/mach-s3c24xx/Kconfig2
-rw-r--r--arch/arm/mach-shmobile/Kconfig2
-rw-r--r--arch/arm/mach-vexpress/Kconfig2
-rw-r--r--arch/arm/plat-samsung/Kconfig4
-rw-r--r--arch/arm64/Kconfig2
-rw-r--r--arch/cris/Kconfig2
-rw-r--r--arch/hexagon/Kconfig2
-rw-r--r--arch/m32r/Kconfig2
-rw-r--r--arch/m68k/Kconfig2
-rw-r--r--arch/metag/Kconfig2
-rw-r--r--arch/mips/Kconfig4
-rw-r--r--arch/openrisc/Kconfig2
-rw-r--r--arch/s390/Kconfig2
-rw-r--r--arch/sh/Kconfig4
-rw-r--r--arch/sh/boards/Kconfig8
-rw-r--r--arch/sh/include/asm/io.h4
-rw-r--r--arch/sh/include/asm/io_trapped.h2
-rw-r--r--arch/sh/include/asm/machvec.h2
-rw-r--r--arch/sh/kernel/Makefile2
-rw-r--r--arch/sh/kernel/io_trapped.c4
-rw-r--r--arch/tile/Kconfig2
-rw-r--r--arch/unicore32/Kconfig2
-rw-r--r--arch/xtensa/Kconfig4
-rw-r--r--arch/xtensa/configs/iss_defconfig2
-rw-r--r--arch/xtensa/configs/s6105_defconfig2
-rw-r--r--drivers/char/tpm/Kconfig2
-rw-r--r--drivers/i2c/busses/Kconfig2
-rw-r--r--drivers/net/can/sja1000/Kconfig2
-rw-r--r--drivers/net/ethernet/3com/Kconfig2
-rw-r--r--include/asm-generic/io.h4
-rw-r--r--include/asm-generic/iomap.h2
-rw-r--r--include/linux/io.h2
-rw-r--r--lib/Kconfig4
-rw-r--r--lib/devres.c4
-rw-r--r--lib/iomap.c4
-rw-r--r--sound/isa/Kconfig2
-rw-r--r--sound/pci/Kconfig2
41 files changed, 59 insertions, 59 deletions
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 75de197a2fef..9596b0ab108d 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -57,7 +57,7 @@ config ARCH_FLATMEM_ENABLE
57config MMU 57config MMU
58 def_bool y 58 def_bool y
59 59
60config NO_IOPORT 60config NO_IOPORT_MAP
61 def_bool y 61 def_bool y
62 62
63config GENERIC_CALIBRATE_DELAY 63config GENERIC_CALIBRATE_DELAY
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d7a71e3ef55f..5db05f6a0412 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -126,7 +126,7 @@ config HAVE_TCM
126config HAVE_PROC_CPU 126config HAVE_PROC_CPU
127 bool 127 bool
128 128
129config NO_IOPORT 129config NO_IOPORT_MAP
130 bool 130 bool
131 131
132config EISA 132config EISA
@@ -410,7 +410,7 @@ config ARCH_EBSA110
410 select ISA 410 select ISA
411 select NEED_MACH_IO_H 411 select NEED_MACH_IO_H
412 select NEED_MACH_MEMORY_H 412 select NEED_MACH_MEMORY_H
413 select NO_IOPORT 413 select NO_IOPORT_MAP
414 help 414 help
415 This is an evaluation board for the StrongARM processor available 415 This is an evaluation board for the StrongARM processor available
416 from Digital. It has limited hardware on-board, including an 416 from Digital. It has limited hardware on-board, including an
@@ -428,7 +428,7 @@ config ARCH_EFM32
428 select CPU_V7M 428 select CPU_V7M
429 select GENERIC_CLOCKEVENTS 429 select GENERIC_CLOCKEVENTS
430 select NO_DMA 430 select NO_DMA
431 select NO_IOPORT 431 select NO_IOPORT_MAP
432 select SPARSE_IRQ 432 select SPARSE_IRQ
433 select USE_OF 433 select USE_OF
434 help 434 help
@@ -677,7 +677,7 @@ config ARCH_SHMOBILE_LEGACY
677 select HAVE_SMP 677 select HAVE_SMP
678 select MIGHT_HAVE_CACHE_L2X0 678 select MIGHT_HAVE_CACHE_L2X0
679 select MULTI_IRQ_HANDLER 679 select MULTI_IRQ_HANDLER
680 select NO_IOPORT 680 select NO_IOPORT_MAP
681 select PINCTRL 681 select PINCTRL
682 select PM_GENERIC_DOMAINS if PM 682 select PM_GENERIC_DOMAINS if PM
683 select SPARSE_IRQ 683 select SPARSE_IRQ
@@ -699,7 +699,7 @@ config ARCH_RPC
699 select ISA_DMA_API 699 select ISA_DMA_API
700 select NEED_MACH_IO_H 700 select NEED_MACH_IO_H
701 select NEED_MACH_MEMORY_H 701 select NEED_MACH_MEMORY_H
702 select NO_IOPORT 702 select NO_IOPORT_MAP
703 select VIRT_TO_BUS 703 select VIRT_TO_BUS
704 help 704 help
705 On the Acorn Risc-PC, Linux can support the internal IDE disk and 705 On the Acorn Risc-PC, Linux can support the internal IDE disk and
@@ -760,7 +760,7 @@ config ARCH_S3C64XX
760 select HAVE_S3C2410_I2C if I2C 760 select HAVE_S3C2410_I2C if I2C
761 select HAVE_S3C2410_WATCHDOG if WATCHDOG 761 select HAVE_S3C2410_WATCHDOG if WATCHDOG
762 select HAVE_TCM 762 select HAVE_TCM
763 select NO_IOPORT 763 select NO_IOPORT_MAP
764 select PLAT_SAMSUNG 764 select PLAT_SAMSUNG
765 select PM_GENERIC_DOMAINS if PM 765 select PM_GENERIC_DOMAINS if PM
766 select S3C_DEV_NAND 766 select S3C_DEV_NAND
diff --git a/arch/arm/mach-picoxcell/Kconfig b/arch/arm/mach-picoxcell/Kconfig
index eca9eb1c5931..62240f69b4ee 100644
--- a/arch/arm/mach-picoxcell/Kconfig
+++ b/arch/arm/mach-picoxcell/Kconfig
@@ -4,4 +4,4 @@ config ARCH_PICOXCELL
4 select ARM_VIC 4 select ARM_VIC
5 select DW_APB_TIMER_OF 5 select DW_APB_TIMER_OF
6 select HAVE_TCM 6 select HAVE_TCM
7 select NO_IOPORT 7 select NO_IOPORT_MAP
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 3e8189186a5b..e4e505f52ba0 100644
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -3,7 +3,7 @@ config ARCH_SIRF
3 select ARCH_HAS_RESET_CONTROLLER 3 select ARCH_HAS_RESET_CONTROLLER
4 select ARCH_REQUIRE_GPIOLIB 4 select ARCH_REQUIRE_GPIOLIB
5 select GENERIC_IRQ_CHIP 5 select GENERIC_IRQ_CHIP
6 select NO_IOPORT 6 select NO_IOPORT_MAP
7 select PINCTRL 7 select PINCTRL
8 select PINCTRL_SIRF 8 select PINCTRL_SIRF
9 help 9 help
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index ba1cc6246778..40cf50b9940c 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -12,7 +12,7 @@ if ARCH_S3C24XX
12config PLAT_S3C24XX 12config PLAT_S3C24XX
13 def_bool y 13 def_bool y
14 select ARCH_REQUIRE_GPIOLIB 14 select ARCH_REQUIRE_GPIOLIB
15 select NO_IOPORT 15 select NO_IOPORT_MAP
16 select S3C_DEV_NAND 16 select S3C_DEV_NAND
17 select IRQ_DOMAIN 17 select IRQ_DOMAIN
18 help 18 help
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index a182008e3aeb..0f92ba8e7884 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -10,7 +10,7 @@ config ARCH_SHMOBILE_MULTI
10 select ARM_GIC 10 select ARM_GIC
11 select MIGHT_HAVE_PCI 11 select MIGHT_HAVE_PCI
12 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE 12 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
13 select NO_IOPORT 13 select NO_IOPORT_MAP
14 select PINCTRL 14 select PINCTRL
15 select ARCH_REQUIRE_GPIOLIB 15 select ARCH_REQUIRE_GPIOLIB
16 16
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 80b4be36f10a..657d52d0391f 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -10,7 +10,7 @@ config ARCH_VEXPRESS
10 select HAVE_ARM_TWD if SMP 10 select HAVE_ARM_TWD if SMP
11 select HAVE_PATA_PLATFORM 11 select HAVE_PATA_PLATFORM
12 select ICST 12 select ICST
13 select NO_IOPORT 13 select NO_IOPORT_MAP
14 select PLAT_VERSATILE 14 select PLAT_VERSATILE
15 select PLAT_VERSATILE_CLCD 15 select PLAT_VERSATILE_CLCD
16 select POWER_RESET 16 select POWER_RESET
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index b57e922f1614..243dfcb2ca0e 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -9,7 +9,7 @@ config PLAT_SAMSUNG
9 depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS 9 depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS
10 default y 10 default y
11 select GENERIC_IRQ_CHIP 11 select GENERIC_IRQ_CHIP
12 select NO_IOPORT 12 select NO_IOPORT_MAP
13 help 13 help
14 Base platform code for all Samsung SoC based systems 14 Base platform code for all Samsung SoC based systems
15 15
@@ -19,7 +19,7 @@ config PLAT_S5P
19 default y 19 default y
20 select ARCH_REQUIRE_GPIOLIB 20 select ARCH_REQUIRE_GPIOLIB
21 select ARM_VIC 21 select ARM_VIC
22 select NO_IOPORT 22 select NO_IOPORT_MAP
23 select PLAT_SAMSUNG 23 select PLAT_SAMSUNG
24 select S3C_GPIO_TRACK 24 select S3C_GPIO_TRACK
25 select S5P_GPIO_DRVSTR 25 select S5P_GPIO_DRVSTR
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 9711a5fd948d..8079a23e2701 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -66,7 +66,7 @@ config ARCH_PHYS_ADDR_T_64BIT
66config MMU 66config MMU
67 def_bool y 67 def_bool y
68 68
69config NO_IOPORT 69config NO_IOPORT_MAP
70 def_bool y 70 def_bool y
71 71
72config STACKTRACE_SUPPORT 72config STACKTRACE_SUPPORT
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 7cb90a54b598..52731e221851 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -29,7 +29,7 @@ config GENERIC_CALIBRATE_DELAY
29 bool 29 bool
30 default y 30 default y
31 31
32config NO_IOPORT 32config NO_IOPORT_MAP
33 def_bool y 33 def_bool y
34 34
35config FORCE_MAX_ZONEORDER 35config FORCE_MAX_ZONEORDER
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index fbc5c78c9ac7..0fd6138f6203 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -19,7 +19,7 @@ config HEXAGON
19 select GENERIC_IRQ_SHOW 19 select GENERIC_IRQ_SHOW
20 select HAVE_ARCH_KGDB 20 select HAVE_ARCH_KGDB
21 select HAVE_ARCH_TRACEHOOK 21 select HAVE_ARCH_TRACEHOOK
22 select NO_IOPORT 22 select NO_IOPORT_MAP
23 select GENERIC_IOMAP 23 select GENERIC_IOMAP
24 select GENERIC_SMP_IDLE_THREAD 24 select GENERIC_SMP_IDLE_THREAD
25 select STACKTRACE_SUPPORT 25 select STACKTRACE_SUPPORT
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index ca4504424dae..9e44bbd8051e 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -28,7 +28,7 @@ config ZONE_DMA
28 bool 28 bool
29 default y 29 default y
30 30
31config NO_IOPORT 31config NO_IOPORT_MAP
32 def_bool y 32 def_bool y
33 33
34config NO_DMA 34config NO_DMA
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index b2e322939256..87b7c7581b1d 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -52,7 +52,7 @@ config TIME_LOW_RES
52 bool 52 bool
53 default y 53 default y
54 54
55config NO_IOPORT 55config NO_IOPORT_MAP
56 def_bool y 56 def_bool y
57 57
58config NO_DMA 58config NO_DMA
diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index b1d3c9c0eff8..499b7610eaaf 100644
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -52,7 +52,7 @@ config GENERIC_HWEIGHT
52config GENERIC_CALIBRATE_DELAY 52config GENERIC_CALIBRATE_DELAY
53 def_bool y 53 def_bool y
54 54
55config NO_IOPORT 55config NO_IOPORT_MAP
56 def_bool y 56 def_bool y
57 57
58source "init/Kconfig" 58source "init/Kconfig"
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 16d5ab1615b1..5cd695f905a1 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -175,7 +175,7 @@ config MACH_DECSTATION
175 select CPU_R4000_WORKAROUNDS if 64BIT 175 select CPU_R4000_WORKAROUNDS if 64BIT
176 select CPU_R4400_WORKAROUNDS if 64BIT 176 select CPU_R4400_WORKAROUNDS if 64BIT
177 select DMA_NONCOHERENT 177 select DMA_NONCOHERENT
178 select NO_IOPORT 178 select NO_IOPORT_MAP
179 select IRQ_CPU 179 select IRQ_CPU
180 select SYS_HAS_CPU_R3000 180 select SYS_HAS_CPU_R3000
181 select SYS_HAS_CPU_R4X00 181 select SYS_HAS_CPU_R4X00
@@ -947,7 +947,7 @@ config SYNC_R4K
947config MIPS_MACHINE 947config MIPS_MACHINE
948 def_bool n 948 def_bool n
949 949
950config NO_IOPORT 950config NO_IOPORT_MAP
951 def_bool n 951 def_bool n
952 952
953config GENERIC_ISA_DMA 953config GENERIC_ISA_DMA
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 9488209a5253..e71d712afb79 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -41,7 +41,7 @@ config RWSEM_XCHGADD_ALGORITHM
41config GENERIC_HWEIGHT 41config GENERIC_HWEIGHT
42 def_bool y 42 def_bool y
43 43
44config NO_IOPORT 44config NO_IOPORT_MAP
45 def_bool y 45 def_bool y
46 46
47config TRACE_IRQFLAGS_SUPPORT 47config TRACE_IRQFLAGS_SUPPORT
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 953f17c8d17c..346d21678ffd 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -52,7 +52,7 @@ config KEXEC
52config AUDIT_ARCH 52config AUDIT_ARCH
53 def_bool y 53 def_bool y
54 54
55config NO_IOPORT 55config NO_IOPORT_MAP
56 def_bool y 56 def_bool y
57 57
58config PCI_QUIRKS 58config PCI_QUIRKS
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 1399383315a3..ba55e939a820 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -3,7 +3,7 @@ config SUPERH
3 select ARCH_MIGHT_HAVE_PC_PARPORT 3 select ARCH_MIGHT_HAVE_PC_PARPORT
4 select EXPERT 4 select EXPERT
5 select CLKDEV_LOOKUP 5 select CLKDEV_LOOKUP
6 select HAVE_IDE if HAS_IOPORT 6 select HAVE_IDE if HAS_IOPORT_MAP
7 select HAVE_MEMBLOCK 7 select HAVE_MEMBLOCK
8 select HAVE_MEMBLOCK_NODE_MAP 8 select HAVE_MEMBLOCK_NODE_MAP
9 select ARCH_DISCARD_MEMBLOCK 9 select ARCH_DISCARD_MEMBLOCK
@@ -138,7 +138,7 @@ config ARCH_HAS_ILOG2_U32
138config ARCH_HAS_ILOG2_U64 138config ARCH_HAS_ILOG2_U64
139 def_bool n 139 def_bool n
140 140
141config NO_IOPORT 141config NO_IOPORT_MAP
142 def_bool !PCI 142 def_bool !PCI
143 depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \ 143 depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
144 !SH_HP6XX && !SH_SOLUTION_ENGINE 144 !SH_HP6XX && !SH_SOLUTION_ENGINE
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
index eb1cf84231a2..e331e5373b8e 100644
--- a/arch/sh/boards/Kconfig
+++ b/arch/sh/boards/Kconfig
@@ -158,7 +158,7 @@ config SH_SDK7786
158 bool "SDK7786" 158 bool "SDK7786"
159 depends on CPU_SUBTYPE_SH7786 159 depends on CPU_SUBTYPE_SH7786
160 select SYS_SUPPORTS_PCI 160 select SYS_SUPPORTS_PCI
161 select NO_IOPORT if !PCI 161 select NO_IOPORT_MAP if !PCI
162 select ARCH_WANT_OPTIONAL_GPIOLIB 162 select ARCH_WANT_OPTIONAL_GPIOLIB
163 select HAVE_SRAM_POOL 163 select HAVE_SRAM_POOL
164 select REGULATOR_FIXED_VOLTAGE if REGULATOR 164 select REGULATOR_FIXED_VOLTAGE if REGULATOR
@@ -204,7 +204,7 @@ config SH_URQUELL
204 depends on CPU_SUBTYPE_SH7786 204 depends on CPU_SUBTYPE_SH7786
205 select ARCH_REQUIRE_GPIOLIB 205 select ARCH_REQUIRE_GPIOLIB
206 select SYS_SUPPORTS_PCI 206 select SYS_SUPPORTS_PCI
207 select NO_IOPORT if !PCI 207 select NO_IOPORT_MAP if !PCI
208 208
209config SH_MIGOR 209config SH_MIGOR
210 bool "Migo-R" 210 bool "Migo-R"
@@ -306,7 +306,7 @@ config SH_LBOX_RE2
306config SH_X3PROTO 306config SH_X3PROTO
307 bool "SH-X3 Prototype board" 307 bool "SH-X3 Prototype board"
308 depends on CPU_SUBTYPE_SHX3 308 depends on CPU_SUBTYPE_SHX3
309 select NO_IOPORT if !PCI 309 select NO_IOPORT_MAP if !PCI
310 select IRQ_DOMAIN 310 select IRQ_DOMAIN
311 311
312config SH_MAGIC_PANEL_R2 312config SH_MAGIC_PANEL_R2
@@ -333,7 +333,7 @@ config SH_POLARIS
333 333
334config SH_SH2007 334config SH_SH2007
335 bool "SH-2007 board" 335 bool "SH-2007 board"
336 select NO_IOPORT 336 select NO_IOPORT_MAP
337 select REGULATOR_FIXED_VOLTAGE if REGULATOR 337 select REGULATOR_FIXED_VOLTAGE if REGULATOR
338 depends on CPU_SUBTYPE_SH7780 338 depends on CPU_SUBTYPE_SH7780
339 help 339 help
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index 629db2ad7916..728c4c571f40 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -122,7 +122,7 @@ __BUILD_MEMORY_STRING(__raw_, l, u32)
122 122
123__BUILD_MEMORY_STRING(__raw_, q, u64) 123__BUILD_MEMORY_STRING(__raw_, q, u64)
124 124
125#ifdef CONFIG_HAS_IOPORT 125#ifdef CONFIG_HAS_IOPORT_MAP
126 126
127/* 127/*
128 * Slowdown I/O port space accesses for antique hardware. 128 * Slowdown I/O port space accesses for antique hardware.
@@ -218,7 +218,7 @@ __BUILD_IOPORT_STRING(w, u16)
218__BUILD_IOPORT_STRING(l, u32) 218__BUILD_IOPORT_STRING(l, u32)
219__BUILD_IOPORT_STRING(q, u64) 219__BUILD_IOPORT_STRING(q, u64)
220 220
221#else /* !CONFIG_HAS_IOPORT */ 221#else /* !CONFIG_HAS_IOPORT_MAP */
222 222
223#include <asm/io_noioport.h> 223#include <asm/io_noioport.h>
224 224
diff --git a/arch/sh/include/asm/io_trapped.h b/arch/sh/include/asm/io_trapped.h
index f1251d4f0ba9..4ab94ef51071 100644
--- a/arch/sh/include/asm/io_trapped.h
+++ b/arch/sh/include/asm/io_trapped.h
@@ -36,7 +36,7 @@ __ioremap_trapped(unsigned long offset, unsigned long size)
36#define __ioremap_trapped(offset, size) NULL 36#define __ioremap_trapped(offset, size) NULL
37#endif 37#endif
38 38
39#ifdef CONFIG_HAS_IOPORT 39#ifdef CONFIG_HAS_IOPORT_MAP
40extern struct list_head trapped_io; 40extern struct list_head trapped_io;
41 41
42static inline void __iomem * 42static inline void __iomem *
diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h
index eb9c20d971dd..d3324e4f372e 100644
--- a/arch/sh/include/asm/machvec.h
+++ b/arch/sh/include/asm/machvec.h
@@ -21,7 +21,7 @@ struct sh_machine_vector {
21 int (*mv_irq_demux)(int irq); 21 int (*mv_irq_demux)(int irq);
22 void (*mv_init_irq)(void); 22 void (*mv_init_irq)(void);
23 23
24#ifdef CONFIG_HAS_IOPORT 24#ifdef CONFIG_HAS_IOPORT_MAP
25 void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size); 25 void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size);
26 void (*mv_ioport_unmap)(void __iomem *); 26 void (*mv_ioport_unmap)(void __iomem *);
27#endif 27#endif
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
index 261c8bfd75ce..2ccf36c824c6 100644
--- a/arch/sh/kernel/Makefile
+++ b/arch/sh/kernel/Makefile
@@ -22,7 +22,7 @@ obj-y := debugtraps.o dma-nommu.o dumpstack.o \
22 22
23ifndef CONFIG_GENERIC_IOMAP 23ifndef CONFIG_GENERIC_IOMAP
24obj-y += iomap.o 24obj-y += iomap.o
25obj-$(CONFIG_HAS_IOPORT) += ioport.o 25obj-$(CONFIG_HAS_IOPORT_MAP) += ioport.o
26endif 26endif
27 27
28obj-$(CONFIG_SUPERH32) += sys_sh32.o 28obj-$(CONFIG_SUPERH32) += sys_sh32.o
diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c
index c0a9761f2f8a..f8ce36286cea 100644
--- a/arch/sh/kernel/io_trapped.c
+++ b/arch/sh/kernel/io_trapped.c
@@ -22,7 +22,7 @@
22 22
23#define TRAPPED_PAGES_MAX 16 23#define TRAPPED_PAGES_MAX 16
24 24
25#ifdef CONFIG_HAS_IOPORT 25#ifdef CONFIG_HAS_IOPORT_MAP
26LIST_HEAD(trapped_io); 26LIST_HEAD(trapped_io);
27EXPORT_SYMBOL_GPL(trapped_io); 27EXPORT_SYMBOL_GPL(trapped_io);
28#endif 28#endif
@@ -90,7 +90,7 @@ int register_trapped_io(struct trapped_io *tiop)
90 tiop->magic = IO_TRAPPED_MAGIC; 90 tiop->magic = IO_TRAPPED_MAGIC;
91 INIT_LIST_HEAD(&tiop->list); 91 INIT_LIST_HEAD(&tiop->list);
92 spin_lock_irq(&trapped_lock); 92 spin_lock_irq(&trapped_lock);
93#ifdef CONFIG_HAS_IOPORT 93#ifdef CONFIG_HAS_IOPORT_MAP
94 if (flags & IORESOURCE_IO) 94 if (flags & IORESOURCE_IO)
95 list_add(&tiop->list, &trapped_io); 95 list_add(&tiop->list, &trapped_io);
96#endif 96#endif
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 31c8c6223995..85258ca43ff5 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -411,7 +411,7 @@ config PCI_DOMAINS
411config NO_IOMEM 411config NO_IOMEM
412 def_bool !PCI 412 def_bool !PCI
413 413
414config NO_IOPORT 414config NO_IOPORT_MAP
415 def_bool !PCI 415 def_bool !PCI
416 416
417config TILE_PCI_IO 417config TILE_PCI_IO
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 25c0dba508cc..aafad6fa1667 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -27,7 +27,7 @@ config UNICORE32
27config GENERIC_CSUM 27config GENERIC_CSUM
28 def_bool y 28 def_bool y
29 29
30config NO_IOPORT 30config NO_IOPORT_MAP
31 bool 31 bool
32 32
33config STACKTRACE_SUPPORT 33config STACKTRACE_SUPPORT
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index c87ae7c6e5f9..02d6d29a63c1 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -41,7 +41,7 @@ config ARCH_HAS_ILOG2_U32
41config ARCH_HAS_ILOG2_U64 41config ARCH_HAS_ILOG2_U64
42 def_bool n 42 def_bool n
43 43
44config NO_IOPORT 44config NO_IOPORT_MAP
45 def_bool n 45 def_bool n
46 46
47config HZ 47config HZ
@@ -239,7 +239,7 @@ config XTENSA_PLATFORM_XT2000
239config XTENSA_PLATFORM_S6105 239config XTENSA_PLATFORM_S6105
240 bool "S6105" 240 bool "S6105"
241 select SERIAL_CONSOLE 241 select SERIAL_CONSOLE
242 select NO_IOPORT 242 select NO_IOPORT_MAP
243 243
244config XTENSA_PLATFORM_XTFPGA 244config XTENSA_PLATFORM_XTFPGA
245 bool "XTFPGA" 245 bool "XTFPGA"
diff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig
index 4f233204faf9..d57d917ff240 100644
--- a/arch/xtensa/configs/iss_defconfig
+++ b/arch/xtensa/configs/iss_defconfig
@@ -11,7 +11,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
11CONFIG_GENERIC_HWEIGHT=y 11CONFIG_GENERIC_HWEIGHT=y
12# CONFIG_ARCH_HAS_ILOG2_U32 is not set 12# CONFIG_ARCH_HAS_ILOG2_U32 is not set
13# CONFIG_ARCH_HAS_ILOG2_U64 is not set 13# CONFIG_ARCH_HAS_ILOG2_U64 is not set
14CONFIG_NO_IOPORT=y 14CONFIG_NO_IOPORT_MAP=y
15CONFIG_HZ=100 15CONFIG_HZ=100
16CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 16CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
17CONFIG_CONSTRUCTORS=y 17CONFIG_CONSTRUCTORS=y
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig
index d929f77a0360..583c2b0974ca 100644
--- a/arch/xtensa/configs/s6105_defconfig
+++ b/arch/xtensa/configs/s6105_defconfig
@@ -11,7 +11,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
11CONFIG_GENERIC_HWEIGHT=y 11CONFIG_GENERIC_HWEIGHT=y
12# CONFIG_ARCH_HAS_ILOG2_U32 is not set 12# CONFIG_ARCH_HAS_ILOG2_U32 is not set
13# CONFIG_ARCH_HAS_ILOG2_U64 is not set 13# CONFIG_ARCH_HAS_ILOG2_U64 is not set
14CONFIG_NO_IOPORT=y 14CONFIG_NO_IOPORT_MAP=y
15CONFIG_HZ=100 15CONFIG_HZ=100
16CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 16CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
17 17
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index 1a65838888cd..c54cac3f8bc8 100644
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -74,7 +74,7 @@ config TCG_NSC
74 74
75config TCG_ATMEL 75config TCG_ATMEL
76 tristate "Atmel TPM Interface" 76 tristate "Atmel TPM Interface"
77 depends on PPC64 || HAS_IOPORT 77 depends on PPC64 || HAS_IOPORT_MAP
78 ---help--- 78 ---help---
79 If you have a TPM security chip from Atmel say Yes and it 79 If you have a TPM security chip from Atmel say Yes and it
80 will be accessible from within Linux. To compile this driver 80 will be accessible from within Linux. To compile this driver
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index de17c5593d97..014afab1d551 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -936,7 +936,7 @@ config I2C_ACORN
936 936
937config I2C_ELEKTOR 937config I2C_ELEKTOR
938 tristate "Elektor ISA card" 938 tristate "Elektor ISA card"
939 depends on ISA && HAS_IOPORT && BROKEN_ON_SMP 939 depends on ISA && HAS_IOPORT_MAP && BROKEN_ON_SMP
940 select I2C_ALGOPCF 940 select I2C_ALGOPCF
941 help 941 help
942 This supports the PCF8584 ISA bus I2C adapter. Say Y if you own 942 This supports the PCF8584 ISA bus I2C adapter. Say Y if you own
diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index 4b18b8765523..1e65cb6c2591 100644
--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig
@@ -39,7 +39,7 @@ config CAN_EMS_PCI
39config CAN_PEAK_PCMCIA 39config CAN_PEAK_PCMCIA
40 tristate "PEAK PCAN-PC Card" 40 tristate "PEAK PCAN-PC Card"
41 depends on PCMCIA 41 depends on PCMCIA
42 depends on HAS_IOPORT 42 depends on HAS_IOPORT_MAP
43 ---help--- 43 ---help---
44 This driver is for the PCAN-PC Card PCMCIA adapter (1 or 2 channels) 44 This driver is for the PCAN-PC Card PCMCIA adapter (1 or 2 channels)
45 from PEAK-System (http://www.peak-system.com). To compile this 45 from PEAK-System (http://www.peak-system.com). To compile this
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
index 65b735d4a6ad..afaab4b2333f 100644
--- a/drivers/net/ethernet/3com/Kconfig
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -66,7 +66,7 @@ config PCMCIA_3C589
66 66
67config VORTEX 67config VORTEX
68 tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support" 68 tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
69 depends on (PCI || EISA) && HAS_IOPORT 69 depends on (PCI || EISA) && HAS_IOPORT_MAP
70 select MII 70 select MII
71 ---help--- 71 ---help---
72 This option enables driver support for a large number of 10Mbps and 72 This option enables driver support for a large number of 10Mbps and
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index d5afe96adba6..975e1cc75edb 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -327,7 +327,7 @@ static inline void iounmap(void __iomem *addr)
327} 327}
328#endif /* CONFIG_MMU */ 328#endif /* CONFIG_MMU */
329 329
330#ifdef CONFIG_HAS_IOPORT 330#ifdef CONFIG_HAS_IOPORT_MAP
331#ifndef CONFIG_GENERIC_IOMAP 331#ifndef CONFIG_GENERIC_IOMAP
332static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) 332static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
333{ 333{
@@ -341,7 +341,7 @@ static inline void ioport_unmap(void __iomem *p)
341extern void __iomem *ioport_map(unsigned long port, unsigned int nr); 341extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
342extern void ioport_unmap(void __iomem *p); 342extern void ioport_unmap(void __iomem *p);
343#endif /* CONFIG_GENERIC_IOMAP */ 343#endif /* CONFIG_GENERIC_IOMAP */
344#endif /* CONFIG_HAS_IOPORT */ 344#endif /* CONFIG_HAS_IOPORT_MAP */
345 345
346#ifndef xlate_dev_kmem_ptr 346#ifndef xlate_dev_kmem_ptr
347#define xlate_dev_kmem_ptr(p) p 347#define xlate_dev_kmem_ptr(p) p
diff --git a/include/asm-generic/iomap.h b/include/asm-generic/iomap.h
index 6afd7d6a9899..1b41011643a5 100644
--- a/include/asm-generic/iomap.h
+++ b/include/asm-generic/iomap.h
@@ -56,7 +56,7 @@ extern void iowrite8_rep(void __iomem *port, const void *buf, unsigned long coun
56extern void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count); 56extern void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count);
57extern void iowrite32_rep(void __iomem *port, const void *buf, unsigned long count); 57extern void iowrite32_rep(void __iomem *port, const void *buf, unsigned long count);
58 58
59#ifdef CONFIG_HAS_IOPORT 59#ifdef CONFIG_HAS_IOPORT_MAP
60/* Create a virtual mapping cookie for an IO port range */ 60/* Create a virtual mapping cookie for an IO port range */
61extern void __iomem *ioport_map(unsigned long port, unsigned int nr); 61extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
62extern void ioport_unmap(void __iomem *); 62extern void ioport_unmap(void __iomem *);
diff --git a/include/linux/io.h b/include/linux/io.h
index 8a18e75600cc..b76e6e545806 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -41,7 +41,7 @@ static inline int ioremap_page_range(unsigned long addr, unsigned long end,
41/* 41/*
42 * Managed iomap interface 42 * Managed iomap interface
43 */ 43 */
44#ifdef CONFIG_HAS_IOPORT 44#ifdef CONFIG_HAS_IOPORT_MAP
45void __iomem * devm_ioport_map(struct device *dev, unsigned long port, 45void __iomem * devm_ioport_map(struct device *dev, unsigned long port,
46 unsigned int nr); 46 unsigned int nr);
47void devm_ioport_unmap(struct device *dev, void __iomem *addr); 47void devm_ioport_unmap(struct device *dev, void __iomem *addr);
diff --git a/lib/Kconfig b/lib/Kconfig
index 991c98bc4a3f..5d4984c505f8 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -342,9 +342,9 @@ config HAS_IOMEM
342 select GENERIC_IO 342 select GENERIC_IO
343 default y 343 default y
344 344
345config HAS_IOPORT 345config HAS_IOPORT_MAP
346 boolean 346 boolean
347 depends on HAS_IOMEM && !NO_IOPORT 347 depends on HAS_IOMEM && !NO_IOPORT_MAP
348 default y 348 default y
349 349
350config HAS_DMA 350config HAS_DMA
diff --git a/lib/devres.c b/lib/devres.c
index 48cb3c7bd7de..2f16c133fd36 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -170,7 +170,7 @@ void __iomem *devm_request_and_ioremap(struct device *device,
170} 170}
171EXPORT_SYMBOL(devm_request_and_ioremap); 171EXPORT_SYMBOL(devm_request_and_ioremap);
172 172
173#ifdef CONFIG_HAS_IOPORT 173#ifdef CONFIG_HAS_IOPORT_MAP
174/* 174/*
175 * Generic iomap devres 175 * Generic iomap devres
176 */ 176 */
@@ -229,7 +229,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
229 devm_ioport_map_match, (__force void *)addr)); 229 devm_ioport_map_match, (__force void *)addr));
230} 230}
231EXPORT_SYMBOL(devm_ioport_unmap); 231EXPORT_SYMBOL(devm_ioport_unmap);
232#endif /* CONFIG_HAS_IOPORT */ 232#endif /* CONFIG_HAS_IOPORT_MAP */
233 233
234#ifdef CONFIG_PCI 234#ifdef CONFIG_PCI
235/* 235/*
diff --git a/lib/iomap.c b/lib/iomap.c
index 2c08f36862eb..fc3dcb4b238e 100644
--- a/lib/iomap.c
+++ b/lib/iomap.c
@@ -224,7 +224,7 @@ EXPORT_SYMBOL(iowrite8_rep);
224EXPORT_SYMBOL(iowrite16_rep); 224EXPORT_SYMBOL(iowrite16_rep);
225EXPORT_SYMBOL(iowrite32_rep); 225EXPORT_SYMBOL(iowrite32_rep);
226 226
227#ifdef CONFIG_HAS_IOPORT 227#ifdef CONFIG_HAS_IOPORT_MAP
228/* Create a virtual mapping cookie for an IO port range */ 228/* Create a virtual mapping cookie for an IO port range */
229void __iomem *ioport_map(unsigned long port, unsigned int nr) 229void __iomem *ioport_map(unsigned long port, unsigned int nr)
230{ 230{
@@ -239,7 +239,7 @@ void ioport_unmap(void __iomem *addr)
239} 239}
240EXPORT_SYMBOL(ioport_map); 240EXPORT_SYMBOL(ioport_map);
241EXPORT_SYMBOL(ioport_unmap); 241EXPORT_SYMBOL(ioport_unmap);
242#endif /* CONFIG_HAS_IOPORT */ 242#endif /* CONFIG_HAS_IOPORT_MAP */
243 243
244#ifdef CONFIG_PCI 244#ifdef CONFIG_PCI
245/* Hide the details if this is a MMIO or PIO address space and just do what 245/* Hide the details if this is a MMIO or PIO address space and just do what
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index affa13480659..0216475fc759 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -191,7 +191,7 @@ config SND_ES18XX
191 191
192config SND_SC6000 192config SND_SC6000
193 tristate "Gallant SC-6000/6600/7000 and Audio Excel DSP 16" 193 tristate "Gallant SC-6000/6600/7000 and Audio Excel DSP 16"
194 depends on HAS_IOPORT 194 depends on HAS_IOPORT_MAP
195 select SND_WSS_LIB 195 select SND_WSS_LIB
196 select SND_OPL3_LIB 196 select SND_OPL3_LIB
197 select SND_MPU401_UART 197 select SND_MPU401_UART
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 0b0c0cf13f74..3a3a3a71088b 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -688,7 +688,7 @@ config SND_LOLA
688 688
689config SND_LX6464ES 689config SND_LX6464ES
690 tristate "Digigram LX6464ES" 690 tristate "Digigram LX6464ES"
691 depends on HAS_IOPORT 691 depends on HAS_IOPORT_MAP
692 select SND_PCM 692 select SND_PCM
693 help 693 help
694 Say Y here to include support for Digigram LX6464ES boards. 694 Say Y here to include support for Digigram LX6464ES boards.
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-21 01:32:24 -0400