Skip to content

Commit ce816fa

Browse files
Uwe Kleine-Königtorvalds
Uwe Kleine-König
authored and
torvalds
committed
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>
1 parent 6d08a25 commit ce816fa

41 files changed

Lines changed: 59 additions & 59 deletions

File tree

Some content is hidden

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

‎arch/arc/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ config ARCH_FLATMEM_ENABLE
5757
config MMU
5858
def_bool y
5959

60-
config NO_IOPORT
60+
config NO_IOPORT_MAP
6161
def_bool y
6262

6363
config GENERIC_CALIBRATE_DELAY

‎arch/arm/Kconfig‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ config HAVE_TCM
126126
config HAVE_PROC_CPU
127127
bool
128128

129-
config NO_IOPORT
129+
config NO_IOPORT_MAP
130130
bool
131131

132132
config EISA
@@ -410,7 +410,7 @@ config ARCH_EBSA110
410410
select ISA
411411
select NEED_MACH_IO_H
412412
select NEED_MACH_MEMORY_H
413-
select NO_IOPORT
413+
select NO_IOPORT_MAP
414414
help
415415
This is an evaluation board for the StrongARM processor available
416416
from Digital. It has limited hardware on-board, including an
@@ -428,7 +428,7 @@ config ARCH_EFM32
428428
select CPU_V7M
429429
select GENERIC_CLOCKEVENTS
430430
select NO_DMA
431-
select NO_IOPORT
431+
select NO_IOPORT_MAP
432432
select SPARSE_IRQ
433433
select USE_OF
434434
help
@@ -677,7 +677,7 @@ config ARCH_SHMOBILE_LEGACY
677677
select HAVE_SMP
678678
select MIGHT_HAVE_CACHE_L2X0
679679
select MULTI_IRQ_HANDLER
680-
select NO_IOPORT
680+
select NO_IOPORT_MAP
681681
select PINCTRL
682682
select PM_GENERIC_DOMAINS if PM
683683
select SPARSE_IRQ
@@ -699,7 +699,7 @@ config ARCH_RPC
699699
select ISA_DMA_API
700700
select NEED_MACH_IO_H
701701
select NEED_MACH_MEMORY_H
702-
select NO_IOPORT
702+
select NO_IOPORT_MAP
703703
select VIRT_TO_BUS
704704
help
705705
On the Acorn Risc-PC, Linux can support the internal IDE disk and
@@ -760,7 +760,7 @@ config ARCH_S3C64XX
760760
select HAVE_S3C2410_I2C if I2C
761761
select HAVE_S3C2410_WATCHDOG if WATCHDOG
762762
select HAVE_TCM
763-
select NO_IOPORT
763+
select NO_IOPORT_MAP
764764
select PLAT_SAMSUNG
765765
select PM_GENERIC_DOMAINS if PM
766766
select S3C_DEV_NAND

‎arch/arm/mach-picoxcell/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ config ARCH_PICOXCELL
44
select ARM_VIC
55
select DW_APB_TIMER_OF
66
select HAVE_TCM
7-
select NO_IOPORT
7+
select NO_IOPORT_MAP

‎arch/arm/mach-prima2/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ config ARCH_SIRF
33
select ARCH_HAS_RESET_CONTROLLER
44
select ARCH_REQUIRE_GPIOLIB
55
select GENERIC_IRQ_CHIP
6-
select NO_IOPORT
6+
select NO_IOPORT_MAP
77
select PINCTRL
88
select PINCTRL_SIRF
99
help

‎arch/arm/mach-s3c24xx/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if ARCH_S3C24XX
1212
config PLAT_S3C24XX
1313
def_bool y
1414
select ARCH_REQUIRE_GPIOLIB
15-
select NO_IOPORT
15+
select NO_IOPORT_MAP
1616
select S3C_DEV_NAND
1717
select IRQ_DOMAIN
1818
help

‎arch/arm/mach-shmobile/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config ARCH_SHMOBILE_MULTI
1010
select ARM_GIC
1111
select MIGHT_HAVE_PCI
1212
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
13-
select NO_IOPORT
13+
select NO_IOPORT_MAP
1414
select PINCTRL
1515
select ARCH_REQUIRE_GPIOLIB
1616

‎arch/arm/mach-vexpress/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config ARCH_VEXPRESS
1010
select HAVE_ARM_TWD if SMP
1111
select HAVE_PATA_PLATFORM
1212
select ICST
13-
select NO_IOPORT
13+
select NO_IOPORT_MAP
1414
select PLAT_VERSATILE
1515
select PLAT_VERSATILE_CLCD
1616
select POWER_RESET

‎arch/arm/plat-samsung/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ config PLAT_SAMSUNG
99
depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS
1010
default y
1111
select GENERIC_IRQ_CHIP
12-
select NO_IOPORT
12+
select NO_IOPORT_MAP
1313
help
1414
Base platform code for all Samsung SoC based systems
1515

@@ -19,7 +19,7 @@ config PLAT_S5P
1919
default y
2020
select ARCH_REQUIRE_GPIOLIB
2121
select ARM_VIC
22-
select NO_IOPORT
22+
select NO_IOPORT_MAP
2323
select PLAT_SAMSUNG
2424
select S3C_GPIO_TRACK
2525
select S5P_GPIO_DRVSTR

‎arch/arm64/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ config ARCH_PHYS_ADDR_T_64BIT
6666
config MMU
6767
def_bool y
6868

69-
config NO_IOPORT
69+
config NO_IOPORT_MAP
7070
def_bool y
7171

7272
config STACKTRACE_SUPPORT

‎arch/cris/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ config GENERIC_CALIBRATE_DELAY
2929
bool
3030
default y
3131

32-
config NO_IOPORT
32+
config NO_IOPORT_MAP
3333
def_bool y
3434

3535
config FORCE_MAX_ZONEORDER

0 commit comments

Comments
 (0)