Skip to content
Snippets Groups Projects
Commit ce816fa8 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Linus Torvalds
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6d08a256
No related branches found
No related tags found
No related merge requests found
Showing
with 32 additions and 32 deletions
...@@ -57,7 +57,7 @@ config ARCH_FLATMEM_ENABLE ...@@ -57,7 +57,7 @@ config ARCH_FLATMEM_ENABLE
config MMU config MMU
def_bool y def_bool y
config NO_IOPORT config NO_IOPORT_MAP
def_bool y def_bool y
config GENERIC_CALIBRATE_DELAY config GENERIC_CALIBRATE_DELAY
......
...@@ -126,7 +126,7 @@ config HAVE_TCM ...@@ -126,7 +126,7 @@ config HAVE_TCM
config HAVE_PROC_CPU config HAVE_PROC_CPU
bool bool
config NO_IOPORT config NO_IOPORT_MAP
bool bool
config EISA config EISA
...@@ -410,7 +410,7 @@ config ARCH_EBSA110 ...@@ -410,7 +410,7 @@ config ARCH_EBSA110
select ISA select ISA
select NEED_MACH_IO_H select NEED_MACH_IO_H
select NEED_MACH_MEMORY_H select NEED_MACH_MEMORY_H
select NO_IOPORT select NO_IOPORT_MAP
help help
This is an evaluation board for the StrongARM processor available This is an evaluation board for the StrongARM processor available
from Digital. It has limited hardware on-board, including an from Digital. It has limited hardware on-board, including an
...@@ -428,7 +428,7 @@ config ARCH_EFM32 ...@@ -428,7 +428,7 @@ config ARCH_EFM32
select CPU_V7M select CPU_V7M
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select NO_DMA select NO_DMA
select NO_IOPORT select NO_IOPORT_MAP
select SPARSE_IRQ select SPARSE_IRQ
select USE_OF select USE_OF
help help
...@@ -677,7 +677,7 @@ config ARCH_SHMOBILE_LEGACY ...@@ -677,7 +677,7 @@ config ARCH_SHMOBILE_LEGACY
select HAVE_SMP select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_CACHE_L2X0
select MULTI_IRQ_HANDLER select MULTI_IRQ_HANDLER
select NO_IOPORT select NO_IOPORT_MAP
select PINCTRL select PINCTRL
select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS if PM
select SPARSE_IRQ select SPARSE_IRQ
...@@ -699,7 +699,7 @@ config ARCH_RPC ...@@ -699,7 +699,7 @@ config ARCH_RPC
select ISA_DMA_API select ISA_DMA_API
select NEED_MACH_IO_H select NEED_MACH_IO_H
select NEED_MACH_MEMORY_H select NEED_MACH_MEMORY_H
select NO_IOPORT select NO_IOPORT_MAP
select VIRT_TO_BUS select VIRT_TO_BUS
help help
On the Acorn Risc-PC, Linux can support the internal IDE disk and On the Acorn Risc-PC, Linux can support the internal IDE disk and
...@@ -760,7 +760,7 @@ config ARCH_S3C64XX ...@@ -760,7 +760,7 @@ config ARCH_S3C64XX
select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_I2C if I2C
select HAVE_S3C2410_WATCHDOG if WATCHDOG select HAVE_S3C2410_WATCHDOG if WATCHDOG
select HAVE_TCM select HAVE_TCM
select NO_IOPORT select NO_IOPORT_MAP
select PLAT_SAMSUNG select PLAT_SAMSUNG
select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS if PM
select S3C_DEV_NAND select S3C_DEV_NAND
......
...@@ -4,4 +4,4 @@ config ARCH_PICOXCELL ...@@ -4,4 +4,4 @@ config ARCH_PICOXCELL
select ARM_VIC select ARM_VIC
select DW_APB_TIMER_OF select DW_APB_TIMER_OF
select HAVE_TCM select HAVE_TCM
select NO_IOPORT select NO_IOPORT_MAP
...@@ -3,7 +3,7 @@ config ARCH_SIRF ...@@ -3,7 +3,7 @@ config ARCH_SIRF
select ARCH_HAS_RESET_CONTROLLER select ARCH_HAS_RESET_CONTROLLER
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select NO_IOPORT select NO_IOPORT_MAP
select PINCTRL select PINCTRL
select PINCTRL_SIRF select PINCTRL_SIRF
help help
......
...@@ -12,7 +12,7 @@ if ARCH_S3C24XX ...@@ -12,7 +12,7 @@ if ARCH_S3C24XX
config PLAT_S3C24XX config PLAT_S3C24XX
def_bool y def_bool y
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select NO_IOPORT select NO_IOPORT_MAP
select S3C_DEV_NAND select S3C_DEV_NAND
select IRQ_DOMAIN select IRQ_DOMAIN
help help
......
...@@ -10,7 +10,7 @@ config ARCH_SHMOBILE_MULTI ...@@ -10,7 +10,7 @@ config ARCH_SHMOBILE_MULTI
select ARM_GIC select ARM_GIC
select MIGHT_HAVE_PCI select MIGHT_HAVE_PCI
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
select NO_IOPORT select NO_IOPORT_MAP
select PINCTRL select PINCTRL
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
......
...@@ -10,7 +10,7 @@ config ARCH_VEXPRESS ...@@ -10,7 +10,7 @@ config ARCH_VEXPRESS
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_PATA_PLATFORM select HAVE_PATA_PLATFORM
select ICST select ICST
select NO_IOPORT select NO_IOPORT_MAP
select PLAT_VERSATILE select PLAT_VERSATILE
select PLAT_VERSATILE_CLCD select PLAT_VERSATILE_CLCD
select POWER_RESET select POWER_RESET
......
...@@ -9,7 +9,7 @@ config PLAT_SAMSUNG ...@@ -9,7 +9,7 @@ config PLAT_SAMSUNG
depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS
default y default y
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select NO_IOPORT select NO_IOPORT_MAP
help help
Base platform code for all Samsung SoC based systems Base platform code for all Samsung SoC based systems
...@@ -19,7 +19,7 @@ config PLAT_S5P ...@@ -19,7 +19,7 @@ config PLAT_S5P
default y default y
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select ARM_VIC select ARM_VIC
select NO_IOPORT select NO_IOPORT_MAP
select PLAT_SAMSUNG select PLAT_SAMSUNG
select S3C_GPIO_TRACK select S3C_GPIO_TRACK
select S5P_GPIO_DRVSTR select S5P_GPIO_DRVSTR
......
...@@ -66,7 +66,7 @@ config ARCH_PHYS_ADDR_T_64BIT ...@@ -66,7 +66,7 @@ config ARCH_PHYS_ADDR_T_64BIT
config MMU config MMU
def_bool y def_bool y
config NO_IOPORT config NO_IOPORT_MAP
def_bool y def_bool y
config STACKTRACE_SUPPORT config STACKTRACE_SUPPORT
......
...@@ -29,7 +29,7 @@ config GENERIC_CALIBRATE_DELAY ...@@ -29,7 +29,7 @@ config GENERIC_CALIBRATE_DELAY
bool bool
default y default y
config NO_IOPORT config NO_IOPORT_MAP
def_bool y def_bool y
config FORCE_MAX_ZONEORDER config FORCE_MAX_ZONEORDER
......
...@@ -19,7 +19,7 @@ config HEXAGON ...@@ -19,7 +19,7 @@ config HEXAGON
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select HAVE_ARCH_KGDB select HAVE_ARCH_KGDB
select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRACEHOOK
select NO_IOPORT select NO_IOPORT_MAP
select GENERIC_IOMAP select GENERIC_IOMAP
select GENERIC_SMP_IDLE_THREAD select GENERIC_SMP_IDLE_THREAD
select STACKTRACE_SUPPORT select STACKTRACE_SUPPORT
......
...@@ -28,7 +28,7 @@ config ZONE_DMA ...@@ -28,7 +28,7 @@ config ZONE_DMA
bool bool
default y default y
config NO_IOPORT config NO_IOPORT_MAP
def_bool y def_bool y
config NO_DMA config NO_DMA
......
...@@ -52,7 +52,7 @@ config TIME_LOW_RES ...@@ -52,7 +52,7 @@ config TIME_LOW_RES
bool bool
default y default y
config NO_IOPORT config NO_IOPORT_MAP
def_bool y def_bool y
config NO_DMA config NO_DMA
......
...@@ -52,7 +52,7 @@ config GENERIC_HWEIGHT ...@@ -52,7 +52,7 @@ config GENERIC_HWEIGHT
config GENERIC_CALIBRATE_DELAY config GENERIC_CALIBRATE_DELAY
def_bool y def_bool y
config NO_IOPORT config NO_IOPORT_MAP
def_bool y def_bool y
source "init/Kconfig" source "init/Kconfig"
......
...@@ -175,7 +175,7 @@ config MACH_DECSTATION ...@@ -175,7 +175,7 @@ config MACH_DECSTATION
select CPU_R4000_WORKAROUNDS if 64BIT select CPU_R4000_WORKAROUNDS if 64BIT
select CPU_R4400_WORKAROUNDS if 64BIT select CPU_R4400_WORKAROUNDS if 64BIT
select DMA_NONCOHERENT select DMA_NONCOHERENT
select NO_IOPORT select NO_IOPORT_MAP
select IRQ_CPU select IRQ_CPU
select SYS_HAS_CPU_R3000 select SYS_HAS_CPU_R3000
select SYS_HAS_CPU_R4X00 select SYS_HAS_CPU_R4X00
...@@ -947,7 +947,7 @@ config SYNC_R4K ...@@ -947,7 +947,7 @@ config SYNC_R4K
config MIPS_MACHINE config MIPS_MACHINE
def_bool n def_bool n
config NO_IOPORT config NO_IOPORT_MAP
def_bool n def_bool n
config GENERIC_ISA_DMA config GENERIC_ISA_DMA
......
...@@ -41,7 +41,7 @@ config RWSEM_XCHGADD_ALGORITHM ...@@ -41,7 +41,7 @@ config RWSEM_XCHGADD_ALGORITHM
config GENERIC_HWEIGHT config GENERIC_HWEIGHT
def_bool y def_bool y
config NO_IOPORT config NO_IOPORT_MAP
def_bool y def_bool y
config TRACE_IRQFLAGS_SUPPORT config TRACE_IRQFLAGS_SUPPORT
......
...@@ -52,7 +52,7 @@ config KEXEC ...@@ -52,7 +52,7 @@ config KEXEC
config AUDIT_ARCH config AUDIT_ARCH
def_bool y def_bool y
config NO_IOPORT config NO_IOPORT_MAP
def_bool y def_bool y
config PCI_QUIRKS config PCI_QUIRKS
......
...@@ -3,7 +3,7 @@ config SUPERH ...@@ -3,7 +3,7 @@ config SUPERH
select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_PARPORT
select EXPERT select EXPERT
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select HAVE_IDE if HAS_IOPORT select HAVE_IDE if HAS_IOPORT_MAP
select HAVE_MEMBLOCK select HAVE_MEMBLOCK
select HAVE_MEMBLOCK_NODE_MAP select HAVE_MEMBLOCK_NODE_MAP
select ARCH_DISCARD_MEMBLOCK select ARCH_DISCARD_MEMBLOCK
...@@ -138,7 +138,7 @@ config ARCH_HAS_ILOG2_U32 ...@@ -138,7 +138,7 @@ config ARCH_HAS_ILOG2_U32
config ARCH_HAS_ILOG2_U64 config ARCH_HAS_ILOG2_U64
def_bool n def_bool n
config NO_IOPORT config NO_IOPORT_MAP
def_bool !PCI def_bool !PCI
depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \ depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
!SH_HP6XX && !SH_SOLUTION_ENGINE !SH_HP6XX && !SH_SOLUTION_ENGINE
......
...@@ -158,7 +158,7 @@ config SH_SDK7786 ...@@ -158,7 +158,7 @@ config SH_SDK7786
bool "SDK7786" bool "SDK7786"
depends on CPU_SUBTYPE_SH7786 depends on CPU_SUBTYPE_SH7786
select SYS_SUPPORTS_PCI select SYS_SUPPORTS_PCI
select NO_IOPORT if !PCI select NO_IOPORT_MAP if !PCI
select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_OPTIONAL_GPIOLIB
select HAVE_SRAM_POOL select HAVE_SRAM_POOL
select REGULATOR_FIXED_VOLTAGE if REGULATOR select REGULATOR_FIXED_VOLTAGE if REGULATOR
...@@ -204,7 +204,7 @@ config SH_URQUELL ...@@ -204,7 +204,7 @@ config SH_URQUELL
depends on CPU_SUBTYPE_SH7786 depends on CPU_SUBTYPE_SH7786
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select SYS_SUPPORTS_PCI select SYS_SUPPORTS_PCI
select NO_IOPORT if !PCI select NO_IOPORT_MAP if !PCI
config SH_MIGOR config SH_MIGOR
bool "Migo-R" bool "Migo-R"
...@@ -306,7 +306,7 @@ config SH_LBOX_RE2 ...@@ -306,7 +306,7 @@ config SH_LBOX_RE2
config SH_X3PROTO config SH_X3PROTO
bool "SH-X3 Prototype board" bool "SH-X3 Prototype board"
depends on CPU_SUBTYPE_SHX3 depends on CPU_SUBTYPE_SHX3
select NO_IOPORT if !PCI select NO_IOPORT_MAP if !PCI
select IRQ_DOMAIN select IRQ_DOMAIN
config SH_MAGIC_PANEL_R2 config SH_MAGIC_PANEL_R2
...@@ -333,7 +333,7 @@ config SH_POLARIS ...@@ -333,7 +333,7 @@ config SH_POLARIS
config SH_SH2007 config SH_SH2007
bool "SH-2007 board" bool "SH-2007 board"
select NO_IOPORT select NO_IOPORT_MAP
select REGULATOR_FIXED_VOLTAGE if REGULATOR select REGULATOR_FIXED_VOLTAGE if REGULATOR
depends on CPU_SUBTYPE_SH7780 depends on CPU_SUBTYPE_SH7780
help help
......
...@@ -122,7 +122,7 @@ __BUILD_MEMORY_STRING(__raw_, l, u32) ...@@ -122,7 +122,7 @@ __BUILD_MEMORY_STRING(__raw_, l, u32)
__BUILD_MEMORY_STRING(__raw_, q, u64) __BUILD_MEMORY_STRING(__raw_, q, u64)
#ifdef CONFIG_HAS_IOPORT #ifdef CONFIG_HAS_IOPORT_MAP
/* /*
* Slowdown I/O port space accesses for antique hardware. * Slowdown I/O port space accesses for antique hardware.
...@@ -218,7 +218,7 @@ __BUILD_IOPORT_STRING(w, u16) ...@@ -218,7 +218,7 @@ __BUILD_IOPORT_STRING(w, u16)
__BUILD_IOPORT_STRING(l, u32) __BUILD_IOPORT_STRING(l, u32)
__BUILD_IOPORT_STRING(q, u64) __BUILD_IOPORT_STRING(q, u64)
#else /* !CONFIG_HAS_IOPORT */ #else /* !CONFIG_HAS_IOPORT_MAP */
#include <asm/io_noioport.h> #include <asm/io_noioport.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment