aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/kernel/io.c
diff options
context:
space:
mode:
authorMagnus Damm <magnus.damm@gmail.com>2008-02-19 21:35:31 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-04-16 16:00:14 +0900
commit8ce0143b11cdc519b8e1fd94a262b654ef0bc3ab (patch)
tree912403b5b8b853ca1479e95590ac2fd057de0030 /arch/sh/kernel/io.c
parentef339f241b08a16af58897e6288ba200e0c7a8c7 (diff)
sh: pci io port base address code
Adds a __get_pci_io_base() function which is used to match a port range against struct pci_channel. This allows us to detect if a port range is assigned to pci or happens to be legacy port io. While at it, remove unused cpu-specific cruft. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/io.c')
-rw-r--r--arch/sh/kernel/io.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c
index 29cf4588fc0..59fb020718a 100644
--- a/arch/sh/kernel/io.c
+++ b/arch/sh/kernel/io.c
@@ -12,6 +12,7 @@
* for more details.
*/
#include <linux/module.h>
+#include <linux/pci.h>
#include <asm/machvec.h>
#include <asm/io.h>
@@ -69,6 +70,10 @@ void __iomem *ioport_map(unsigned long port, unsigned int nr)
if (ret)
return ret;
+ ret = __get_pci_io_base(port, nr);
+ if (ret)
+ return ret;
+
return __ioport_map(port, nr);
}
EXPORT_SYMBOL(ioport_map);