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

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>

authored by

Uwe Kleine-König and committed by
Linus Torvalds ce816fa8 6d08a256

+59 -59
+1 -1
arch/arc/Kconfig
··· 57 57 config MMU 58 58 def_bool y 59 59 60 - config NO_IOPORT 60 + config NO_IOPORT_MAP 61 61 def_bool y 62 62 63 63 config GENERIC_CALIBRATE_DELAY
+6 -6
arch/arm/Kconfig
··· 126 126 config HAVE_PROC_CPU 127 127 bool 128 128 129 - config NO_IOPORT 129 + config NO_IOPORT_MAP 130 130 bool 131 131 132 132 config EISA ··· 410 410 select ISA 411 411 select NEED_MACH_IO_H 412 412 select NEED_MACH_MEMORY_H 413 - select NO_IOPORT 413 + select NO_IOPORT_MAP 414 414 help 415 415 This is an evaluation board for the StrongARM processor available 416 416 from Digital. It has limited hardware on-board, including an ··· 428 428 select CPU_V7M 429 429 select GENERIC_CLOCKEVENTS 430 430 select NO_DMA 431 - select NO_IOPORT 431 + select NO_IOPORT_MAP 432 432 select SPARSE_IRQ 433 433 select USE_OF 434 434 help ··· 677 677 select HAVE_SMP 678 678 select MIGHT_HAVE_CACHE_L2X0 679 679 select MULTI_IRQ_HANDLER 680 - select NO_IOPORT 680 + select NO_IOPORT_MAP 681 681 select PINCTRL 682 682 select PM_GENERIC_DOMAINS if PM 683 683 select SPARSE_IRQ ··· 699 699 select ISA_DMA_API 700 700 select NEED_MACH_IO_H 701 701 select NEED_MACH_MEMORY_H 702 - select NO_IOPORT 702 + select NO_IOPORT_MAP 703 703 select VIRT_TO_BUS 704 704 help 705 705 On the Acorn Risc-PC, Linux can support the internal IDE disk and ··· 760 760 select HAVE_S3C2410_I2C if I2C 761 761 select HAVE_S3C2410_WATCHDOG if WATCHDOG 762 762 select HAVE_TCM 763 - select NO_IOPORT 763 + select NO_IOPORT_MAP 764 764 select PLAT_SAMSUNG 765 765 select PM_GENERIC_DOMAINS if PM 766 766 select S3C_DEV_NAND
+1 -1
arch/arm/mach-picoxcell/Kconfig
··· 4 4 select ARM_VIC 5 5 select DW_APB_TIMER_OF 6 6 select HAVE_TCM 7 - select NO_IOPORT 7 + select NO_IOPORT_MAP
+1 -1
arch/arm/mach-prima2/Kconfig
··· 3 3 select ARCH_HAS_RESET_CONTROLLER 4 4 select ARCH_REQUIRE_GPIOLIB 5 5 select GENERIC_IRQ_CHIP 6 - select NO_IOPORT 6 + select NO_IOPORT_MAP 7 7 select PINCTRL 8 8 select PINCTRL_SIRF 9 9 help
+1 -1
arch/arm/mach-s3c24xx/Kconfig
··· 12 12 config PLAT_S3C24XX 13 13 def_bool y 14 14 select ARCH_REQUIRE_GPIOLIB 15 - select NO_IOPORT 15 + select NO_IOPORT_MAP 16 16 select S3C_DEV_NAND 17 17 select IRQ_DOMAIN 18 18 help
+1 -1
arch/arm/mach-shmobile/Kconfig
··· 10 10 select ARM_GIC 11 11 select MIGHT_HAVE_PCI 12 12 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE 13 - select NO_IOPORT 13 + select NO_IOPORT_MAP 14 14 select PINCTRL 15 15 select ARCH_REQUIRE_GPIOLIB 16 16
+1 -1
arch/arm/mach-vexpress/Kconfig
··· 10 10 select HAVE_ARM_TWD if SMP 11 11 select HAVE_PATA_PLATFORM 12 12 select ICST 13 - select NO_IOPORT 13 + select NO_IOPORT_MAP 14 14 select PLAT_VERSATILE 15 15 select PLAT_VERSATILE_CLCD 16 16 select POWER_RESET
+2 -2
arch/arm/plat-samsung/Kconfig
··· 9 9 depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS 10 10 default y 11 11 select GENERIC_IRQ_CHIP 12 - select NO_IOPORT 12 + select NO_IOPORT_MAP 13 13 help 14 14 Base platform code for all Samsung SoC based systems 15 15 ··· 19 19 default y 20 20 select ARCH_REQUIRE_GPIOLIB 21 21 select ARM_VIC 22 - select NO_IOPORT 22 + select NO_IOPORT_MAP 23 23 select PLAT_SAMSUNG 24 24 select S3C_GPIO_TRACK 25 25 select S5P_GPIO_DRVSTR
+1 -1
arch/arm64/Kconfig
··· 66 66 config MMU 67 67 def_bool y 68 68 69 - config NO_IOPORT 69 + config NO_IOPORT_MAP 70 70 def_bool y 71 71 72 72 config STACKTRACE_SUPPORT
+1 -1
arch/cris/Kconfig
··· 29 29 bool 30 30 default y 31 31 32 - config NO_IOPORT 32 + config NO_IOPORT_MAP 33 33 def_bool y 34 34 35 35 config FORCE_MAX_ZONEORDER
+1 -1
arch/hexagon/Kconfig
··· 19 19 select GENERIC_IRQ_SHOW 20 20 select HAVE_ARCH_KGDB 21 21 select HAVE_ARCH_TRACEHOOK 22 - select NO_IOPORT 22 + select NO_IOPORT_MAP 23 23 select GENERIC_IOMAP 24 24 select GENERIC_SMP_IDLE_THREAD 25 25 select STACKTRACE_SUPPORT
+1 -1
arch/m32r/Kconfig
··· 28 28 bool 29 29 default y 30 30 31 - config NO_IOPORT 31 + config NO_IOPORT_MAP 32 32 def_bool y 33 33 34 34 config NO_DMA
+1 -1
arch/m68k/Kconfig
··· 52 52 bool 53 53 default y 54 54 55 - config NO_IOPORT 55 + config NO_IOPORT_MAP 56 56 def_bool y 57 57 58 58 config NO_DMA
+1 -1
arch/metag/Kconfig
··· 52 52 config GENERIC_CALIBRATE_DELAY 53 53 def_bool y 54 54 55 - config NO_IOPORT 55 + config NO_IOPORT_MAP 56 56 def_bool y 57 57 58 58 source "init/Kconfig"
+2 -2
arch/mips/Kconfig
··· 175 175 select CPU_R4000_WORKAROUNDS if 64BIT 176 176 select CPU_R4400_WORKAROUNDS if 64BIT 177 177 select DMA_NONCOHERENT 178 - select NO_IOPORT 178 + select NO_IOPORT_MAP 179 179 select IRQ_CPU 180 180 select SYS_HAS_CPU_R3000 181 181 select SYS_HAS_CPU_R4X00 ··· 947 947 config MIPS_MACHINE 948 948 def_bool n 949 949 950 - config NO_IOPORT 950 + config NO_IOPORT_MAP 951 951 def_bool n 952 952 953 953 config GENERIC_ISA_DMA
+1 -1
arch/openrisc/Kconfig
··· 41 41 config GENERIC_HWEIGHT 42 42 def_bool y 43 43 44 - config NO_IOPORT 44 + config NO_IOPORT_MAP 45 45 def_bool y 46 46 47 47 config TRACE_IRQFLAGS_SUPPORT
+1 -1
arch/s390/Kconfig
··· 52 52 config AUDIT_ARCH 53 53 def_bool y 54 54 55 - config NO_IOPORT 55 + config NO_IOPORT_MAP 56 56 def_bool y 57 57 58 58 config PCI_QUIRKS
+2 -2
arch/sh/Kconfig
··· 3 3 select ARCH_MIGHT_HAVE_PC_PARPORT 4 4 select EXPERT 5 5 select CLKDEV_LOOKUP 6 - select HAVE_IDE if HAS_IOPORT 6 + select HAVE_IDE if HAS_IOPORT_MAP 7 7 select HAVE_MEMBLOCK 8 8 select HAVE_MEMBLOCK_NODE_MAP 9 9 select ARCH_DISCARD_MEMBLOCK ··· 138 138 config ARCH_HAS_ILOG2_U64 139 139 def_bool n 140 140 141 - config NO_IOPORT 141 + config NO_IOPORT_MAP 142 142 def_bool !PCI 143 143 depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \ 144 144 !SH_HP6XX && !SH_SOLUTION_ENGINE
+4 -4
arch/sh/boards/Kconfig
··· 158 158 bool "SDK7786" 159 159 depends on CPU_SUBTYPE_SH7786 160 160 select SYS_SUPPORTS_PCI 161 - select NO_IOPORT if !PCI 161 + select NO_IOPORT_MAP if !PCI 162 162 select ARCH_WANT_OPTIONAL_GPIOLIB 163 163 select HAVE_SRAM_POOL 164 164 select REGULATOR_FIXED_VOLTAGE if REGULATOR ··· 204 204 depends on CPU_SUBTYPE_SH7786 205 205 select ARCH_REQUIRE_GPIOLIB 206 206 select SYS_SUPPORTS_PCI 207 - select NO_IOPORT if !PCI 207 + select NO_IOPORT_MAP if !PCI 208 208 209 209 config SH_MIGOR 210 210 bool "Migo-R" ··· 306 306 config SH_X3PROTO 307 307 bool "SH-X3 Prototype board" 308 308 depends on CPU_SUBTYPE_SHX3 309 - select NO_IOPORT if !PCI 309 + select NO_IOPORT_MAP if !PCI 310 310 select IRQ_DOMAIN 311 311 312 312 config SH_MAGIC_PANEL_R2 ··· 333 333 334 334 config SH_SH2007 335 335 bool "SH-2007 board" 336 - select NO_IOPORT 336 + select NO_IOPORT_MAP 337 337 select REGULATOR_FIXED_VOLTAGE if REGULATOR 338 338 depends on CPU_SUBTYPE_SH7780 339 339 help
+2 -2
arch/sh/include/asm/io.h
··· 122 122 123 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 128 * Slowdown I/O port space accesses for antique hardware. ··· 218 218 __BUILD_IOPORT_STRING(l, u32) 219 219 __BUILD_IOPORT_STRING(q, u64) 220 220 221 - #else /* !CONFIG_HAS_IOPORT */ 221 + #else /* !CONFIG_HAS_IOPORT_MAP */ 222 222 223 223 #include <asm/io_noioport.h> 224 224
+1 -1
arch/sh/include/asm/io_trapped.h
··· 36 36 #define __ioremap_trapped(offset, size) NULL 37 37 #endif 38 38 39 - #ifdef CONFIG_HAS_IOPORT 39 + #ifdef CONFIG_HAS_IOPORT_MAP 40 40 extern struct list_head trapped_io; 41 41 42 42 static inline void __iomem *
+1 -1
arch/sh/include/asm/machvec.h
··· 21 21 int (*mv_irq_demux)(int irq); 22 22 void (*mv_init_irq)(void); 23 23 24 - #ifdef CONFIG_HAS_IOPORT 24 + #ifdef CONFIG_HAS_IOPORT_MAP 25 25 void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size); 26 26 void (*mv_ioport_unmap)(void __iomem *); 27 27 #endif
+1 -1
arch/sh/kernel/Makefile
··· 22 22 23 23 ifndef CONFIG_GENERIC_IOMAP 24 24 obj-y += iomap.o 25 - obj-$(CONFIG_HAS_IOPORT) += ioport.o 25 + obj-$(CONFIG_HAS_IOPORT_MAP) += ioport.o 26 26 endif 27 27 28 28 obj-$(CONFIG_SUPERH32) += sys_sh32.o
+2 -2
arch/sh/kernel/io_trapped.c
··· 22 22 23 23 #define TRAPPED_PAGES_MAX 16 24 24 25 - #ifdef CONFIG_HAS_IOPORT 25 + #ifdef CONFIG_HAS_IOPORT_MAP 26 26 LIST_HEAD(trapped_io); 27 27 EXPORT_SYMBOL_GPL(trapped_io); 28 28 #endif ··· 90 90 tiop->magic = IO_TRAPPED_MAGIC; 91 91 INIT_LIST_HEAD(&tiop->list); 92 92 spin_lock_irq(&trapped_lock); 93 - #ifdef CONFIG_HAS_IOPORT 93 + #ifdef CONFIG_HAS_IOPORT_MAP 94 94 if (flags & IORESOURCE_IO) 95 95 list_add(&tiop->list, &trapped_io); 96 96 #endif
+1 -1
arch/tile/Kconfig
··· 411 411 config NO_IOMEM 412 412 def_bool !PCI 413 413 414 - config NO_IOPORT 414 + config NO_IOPORT_MAP 415 415 def_bool !PCI 416 416 417 417 config TILE_PCI_IO
+1 -1
arch/unicore32/Kconfig
··· 27 27 config GENERIC_CSUM 28 28 def_bool y 29 29 30 - config NO_IOPORT 30 + config NO_IOPORT_MAP 31 31 bool 32 32 33 33 config STACKTRACE_SUPPORT
+2 -2
arch/xtensa/Kconfig
··· 41 41 config ARCH_HAS_ILOG2_U64 42 42 def_bool n 43 43 44 - config NO_IOPORT 44 + config NO_IOPORT_MAP 45 45 def_bool n 46 46 47 47 config HZ ··· 239 239 config XTENSA_PLATFORM_S6105 240 240 bool "S6105" 241 241 select SERIAL_CONSOLE 242 - select NO_IOPORT 242 + select NO_IOPORT_MAP 243 243 244 244 config XTENSA_PLATFORM_XTFPGA 245 245 bool "XTFPGA"
+1 -1
arch/xtensa/configs/iss_defconfig
··· 11 11 CONFIG_GENERIC_HWEIGHT=y 12 12 # CONFIG_ARCH_HAS_ILOG2_U32 is not set 13 13 # CONFIG_ARCH_HAS_ILOG2_U64 is not set 14 - CONFIG_NO_IOPORT=y 14 + CONFIG_NO_IOPORT_MAP=y 15 15 CONFIG_HZ=100 16 16 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 17 17 CONFIG_CONSTRUCTORS=y
+1 -1
arch/xtensa/configs/s6105_defconfig
··· 11 11 CONFIG_GENERIC_HWEIGHT=y 12 12 # CONFIG_ARCH_HAS_ILOG2_U32 is not set 13 13 # CONFIG_ARCH_HAS_ILOG2_U64 is not set 14 - CONFIG_NO_IOPORT=y 14 + CONFIG_NO_IOPORT_MAP=y 15 15 CONFIG_HZ=100 16 16 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 17 17
+1 -1
drivers/char/tpm/Kconfig
··· 74 74 75 75 config TCG_ATMEL 76 76 tristate "Atmel TPM Interface" 77 - depends on PPC64 || HAS_IOPORT 77 + depends on PPC64 || HAS_IOPORT_MAP 78 78 ---help--- 79 79 If you have a TPM security chip from Atmel say Yes and it 80 80 will be accessible from within Linux. To compile this driver
+1 -1
drivers/i2c/busses/Kconfig
··· 936 936 937 937 config I2C_ELEKTOR 938 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 940 select I2C_ALGOPCF 941 941 help 942 942 This supports the PCF8584 ISA bus I2C adapter. Say Y if you own
+1 -1
drivers/net/can/sja1000/Kconfig
··· 39 39 config CAN_PEAK_PCMCIA 40 40 tristate "PEAK PCAN-PC Card" 41 41 depends on PCMCIA 42 - depends on HAS_IOPORT 42 + depends on HAS_IOPORT_MAP 43 43 ---help--- 44 44 This driver is for the PCAN-PC Card PCMCIA adapter (1 or 2 channels) 45 45 from PEAK-System (http://www.peak-system.com). To compile this
+1 -1
drivers/net/ethernet/3com/Kconfig
··· 66 66 67 67 config VORTEX 68 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 70 select MII 71 71 ---help--- 72 72 This option enables driver support for a large number of 10Mbps and
+2 -2
include/asm-generic/io.h
··· 327 327 } 328 328 #endif /* CONFIG_MMU */ 329 329 330 - #ifdef CONFIG_HAS_IOPORT 330 + #ifdef CONFIG_HAS_IOPORT_MAP 331 331 #ifndef CONFIG_GENERIC_IOMAP 332 332 static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) 333 333 { ··· 341 341 extern void __iomem *ioport_map(unsigned long port, unsigned int nr); 342 342 extern void ioport_unmap(void __iomem *p); 343 343 #endif /* CONFIG_GENERIC_IOMAP */ 344 - #endif /* CONFIG_HAS_IOPORT */ 344 + #endif /* CONFIG_HAS_IOPORT_MAP */ 345 345 346 346 #ifndef xlate_dev_kmem_ptr 347 347 #define xlate_dev_kmem_ptr(p) p
+1 -1
include/asm-generic/iomap.h
··· 56 56 extern void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count); 57 57 extern 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 60 /* Create a virtual mapping cookie for an IO port range */ 61 61 extern void __iomem *ioport_map(unsigned long port, unsigned int nr); 62 62 extern void ioport_unmap(void __iomem *);
+1 -1
include/linux/io.h
··· 41 41 /* 42 42 * Managed iomap interface 43 43 */ 44 - #ifdef CONFIG_HAS_IOPORT 44 + #ifdef CONFIG_HAS_IOPORT_MAP 45 45 void __iomem * devm_ioport_map(struct device *dev, unsigned long port, 46 46 unsigned int nr); 47 47 void devm_ioport_unmap(struct device *dev, void __iomem *addr);
+2 -2
lib/Kconfig
··· 342 342 select GENERIC_IO 343 343 default y 344 344 345 - config HAS_IOPORT 345 + config HAS_IOPORT_MAP 346 346 boolean 347 - depends on HAS_IOMEM && !NO_IOPORT 347 + depends on HAS_IOMEM && !NO_IOPORT_MAP 348 348 default y 349 349 350 350 config HAS_DMA
+2 -2
lib/devres.c
··· 170 170 } 171 171 EXPORT_SYMBOL(devm_request_and_ioremap); 172 172 173 - #ifdef CONFIG_HAS_IOPORT 173 + #ifdef CONFIG_HAS_IOPORT_MAP 174 174 /* 175 175 * Generic iomap devres 176 176 */ ··· 229 229 devm_ioport_map_match, (__force void *)addr)); 230 230 } 231 231 EXPORT_SYMBOL(devm_ioport_unmap); 232 - #endif /* CONFIG_HAS_IOPORT */ 232 + #endif /* CONFIG_HAS_IOPORT_MAP */ 233 233 234 234 #ifdef CONFIG_PCI 235 235 /*
+2 -2
lib/iomap.c
··· 224 224 EXPORT_SYMBOL(iowrite16_rep); 225 225 EXPORT_SYMBOL(iowrite32_rep); 226 226 227 - #ifdef CONFIG_HAS_IOPORT 227 + #ifdef CONFIG_HAS_IOPORT_MAP 228 228 /* Create a virtual mapping cookie for an IO port range */ 229 229 void __iomem *ioport_map(unsigned long port, unsigned int nr) 230 230 { ··· 239 239 } 240 240 EXPORT_SYMBOL(ioport_map); 241 241 EXPORT_SYMBOL(ioport_unmap); 242 - #endif /* CONFIG_HAS_IOPORT */ 242 + #endif /* CONFIG_HAS_IOPORT_MAP */ 243 243 244 244 #ifdef CONFIG_PCI 245 245 /* Hide the details if this is a MMIO or PIO address space and just do what
+1 -1
sound/isa/Kconfig
··· 191 191 192 192 config SND_SC6000 193 193 tristate "Gallant SC-6000/6600/7000 and Audio Excel DSP 16" 194 - depends on HAS_IOPORT 194 + depends on HAS_IOPORT_MAP 195 195 select SND_WSS_LIB 196 196 select SND_OPL3_LIB 197 197 select SND_MPU401_UART
+1 -1
sound/pci/Kconfig
··· 688 688 689 689 config SND_LX6464ES 690 690 tristate "Digigram LX6464ES" 691 - depends on HAS_IOPORT 691 + depends on HAS_IOPORT_MAP 692 692 select SND_PCM 693 693 help 694 694 Say Y here to include support for Digigram LX6464ES boards.