aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/io_trapped.c
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 /arch/sh/kernel/io_trapped.c
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 (limited to 'arch/sh/kernel/io_trapped.c')
-rw-r--r--arch/sh/kernel/io_trapped.c4
1 files changed, 2 insertions, 2 deletions
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