aboutsummaryrefslogtreecommitdiff
path: root/arch/microblaze/pci
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2011-11-24 21:06:41 +0200
committerMichael S. Tsirkin <mst@redhat.com>2011-11-28 21:13:10 +0200
commit1b34d16073430671513b5231fb81cbe725b1a0de (patch)
treecb9c153a8bbb21c7e1491d433fe3d0be0f3399c3 /arch/microblaze/pci
parente5bfb72ce2ce558b5a5a46cc5694001f0479c7f2 (diff)
downloadvexpress-lsk-1b34d16073430671513b5231fb81cbe725b1a0de.tar.gz
microblaze: switch to GENERIC_PCI_IOMAP
microblaze copied pci_iomap from generic code, probably to avoid pulling the rest of iomap.c in. Since that's in a separate file now, we can reuse the common implementation. The only difference is handling of nocache flag, that turns out to be done correctly by the generic code since arch/microblaze/include/asm/io.h defines ioremap_nocache same as ioremap. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'arch/microblaze/pci')
-rw-r--r--arch/microblaze/pci/iomap.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/microblaze/pci/iomap.c b/arch/microblaze/pci/iomap.c
index 57acda852f5..b07abbac031 100644
--- a/arch/microblaze/pci/iomap.c
+++ b/arch/microblaze/pci/iomap.c
@@ -10,25 +10,6 @@
#include <asm/io.h>
#include <asm/pci-bridge.h>
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
-{
- resource_size_t start = pci_resource_start(dev, bar);
- resource_size_t len = pci_resource_len(dev, bar);
- unsigned long flags = pci_resource_flags(dev, bar);
-
- if (!len)
- return NULL;
- if (max && len > max)
- len = max;
- if (flags & IORESOURCE_IO)
- return ioport_map(start, len);
- if (flags & IORESOURCE_MEM)
- return ioremap(start, len);
- /* What? */
- return NULL;
-}
-EXPORT_SYMBOL(pci_iomap);
-
void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
{
if (isa_vaddr_is_ioport(addr))