diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-20 11:38:00 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-20 11:38:00 +0400 |
| commit | 0bb34a6bf1f71d5ad2abfda582a2c2794957bc7b (patch) | |
| tree | 2ac5a8400ac65001b78f173b51bd41b0f38d9376 /arch/sh/kernel/io.c | |
| parent | 394b6d2fe624246e258a218dac68d44fe9a8411f (diff) | |
| download | linux-0bb34a6bf1f71d5ad2abfda582a2c2794957bc7b.tar.xz | |
sh: pci: Consolidate pci_iomap() and use the generic I/O base.
This consolidates the pci_iomap() definitions and reworks how the I/O
port base is handled. PCI channels can register their own I/O map base,
or if none is provided, the system-wide generic I/O base is used instead.
Functionally nothing changes, while this allows us to kill off lots of
I/O address special casing and lookups.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/io.c')
| -rw-r--r-- | arch/sh/kernel/io.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c index 59fb020718a3..4f85fffaa557 100644 --- a/arch/sh/kernel/io.c +++ b/arch/sh/kernel/io.c @@ -70,10 +70,6 @@ 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); |