diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2011-11-24 21:10:12 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-11-28 21:13:22 +0200 |
| commit | 43db595e8b5d78ce5ad2feab719814a76e3ad2e5 (patch) | |
| tree | 927ca581da77c3044b0db3cb8fc9bfe3e8fef65f /arch/sh | |
| parent | 335b8cf7c383c5589d29addd7c4149741a4014b9 (diff) | |
| download | kernel_goldelico_gta04-43db595e8b5d78ce5ad2feab719814a76e3ad2e5.zip kernel_goldelico_gta04-43db595e8b5d78ce5ad2feab719814a76e3ad2e5.tar.gz kernel_goldelico_gta04-43db595e8b5d78ce5ad2feab719814a76e3ad2e5.tar.bz2 | |
sh: switch to GENERIC_PCI_IOMAP
sh 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.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sh/drivers/pci/pci.c | 23 |
2 files changed, 1 insertions, 23 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 5aeab58..ead1640 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -857,6 +857,7 @@ config PCI bool "PCI support" depends on SYS_SUPPORTS_PCI select PCI_DOMAINS + select GENERIC_PCI_IOMAP help Find out whether you have a PCI motherboard. PCI is the name of a bus system, i.e. the way the CPU talks to the other stuff inside diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index c2691af..11aaf2f 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -393,29 +393,6 @@ static void __iomem *ioport_map_pci(struct pci_dev *dev, return (void __iomem *)(chan->io_map_base + port); } -void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) -{ - 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 (unlikely(!len || !start)) - return NULL; - if (maxlen && len > maxlen) - len = maxlen; - - if (flags & IORESOURCE_IO) - return ioport_map_pci(dev, start, len); - if (flags & IORESOURCE_MEM) { - if (flags & IORESOURCE_CACHEABLE) - return ioremap(start, len); - return ioremap_nocache(start, len); - } - - return NULL; -} -EXPORT_SYMBOL(pci_iomap); - void pci_iounmap(struct pci_dev *dev, void __iomem *addr) { iounmap(addr); |