sh: switch to GENERIC_PCI_IOMAP
Quoted 5 lines · Michael S. Tsirkin
sh copied
pci_iomapfrom generic code, probably to avoid pulling the rest ofiomap.cin. Since that's in
a separate file now, we can reuse the common implementation.Signed-off-by Michael S. Tsirkin <[email protected]>
Sorry to nag, any ACKs/NACKs on the sh changes?
I intend to send this to Linus if there are no
objections. Thanks!
Quoted 53 lines
--- arch/sh/Kconfig | 1 + arch/sh/drivers/pci/pci.c | 23 ----------------------- 2 files changed, 1 insertions(+), 23 deletions(-)arch/sh/Kconfig +1
-0@@ -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 insidearch/sh/drivers/pci/pci.c +0
-23@@ -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);Signature · 1 line
1.7.5.53.gc233e
Paul Mundt
Acked-byQuoted 11 lines · Michael S. Tsirkin
Quoted 5 lines · Michael S. Tsirkin
sh copied
pci_iomapfrom generic code, probably to avoid pulling the rest ofiomap.cin. Since that's in
a separate file now, we can reuse the common implementation.Signed-off-by Michael S. Tsirkin <[email protected]>Sorry to nag, any ACKs/NACKs on the sh changes?
I intend to send this to Linus if there are no
objections. Thanks!
Nope, looks fine to me.
Acked-by Paul Mundt <[email protected]>