summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/io.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-05-25 20:06:13 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-06-02 16:31:42 +0900
commit86e4dd5add77ab809f5427391dfabb8f78cbcb58 (patch)
tree43d2c40951df78d5404a72da214f8c8a788d3de3 /arch/sh/kernel/io.c
parent1c98347e613bf17ea2f18c9766ce0ab77f65a96d (diff)
downloadblackbird-op-linux-86e4dd5add77ab809f5427391dfabb8f78cbcb58.tar.gz
blackbird-op-linux-86e4dd5add77ab809f5427391dfabb8f78cbcb58.zip
sh: support for platforms without PIO.
This extends some of the existing special casing for HAS_IOPORT platforms and gets it to the point where platforms can begin to conditionally select it. The major changes here are that the PIO routines themselves go away completely, including all of the machvec port mapping wrappers. With this in place it's possible for any non-machvec abusing platform to disable PIO completely. At present this is left as an opt-in until the abusers are the odd ones out instead of the majority. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/io.c')
-rw-r--r--arch/sh/kernel/io.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c
index 4770c241c679..5c51b794ba2a 100644
--- a/arch/sh/kernel/io.c
+++ b/arch/sh/kernel/io.c
@@ -112,25 +112,3 @@ void memset_io(volatile void __iomem *dst, int c, unsigned long count)
}
}
EXPORT_SYMBOL(memset_io);
-
-#ifndef CONFIG_GENERIC_IOMAP
-
-void __iomem *ioport_map(unsigned long port, unsigned int nr)
-{
- void __iomem *ret;
-
- ret = __ioport_map_trapped(port, nr);
- if (ret)
- return ret;
-
- return __ioport_map(port, nr);
-}
-EXPORT_SYMBOL(ioport_map);
-
-void ioport_unmap(void __iomem *addr)
-{
- sh_mv.mv_ioport_unmap(addr);
-}
-EXPORT_SYMBOL(ioport_unmap);
-
-#endif /* CONFIG_GENERIC_IOMAP */
OpenPOWER on IntegriCloud