From a95b1182e9a2a9206e7c3bc8bd1761ed596fac06 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Thu, 24 Nov 2011 21:10:12 +0200 Subject: [PATCH] --- yaml --- r: 283207 b: refs/heads/master c: a21a2fd4036f9a572415a7543896a1163c211ee5 h: refs/heads/master i: 283205: cef04f8b5dcdf423ebf4df92309a193ec055edf5 283203: f1c045563efcd6b806a95f084b58f10209a44657 283199: 1b887748f1573f9f412efdfbbe31819d0a6c4006 v: v3 --- [refs] | 2 +- trunk/arch/sparc/Kconfig | 1 + trunk/arch/sparc/include/asm/io_32.h | 2 +- trunk/arch/sparc/include/asm/io_64.h | 2 +- trunk/arch/sparc/lib/iomap.c | 23 ----------------------- 5 files changed, 4 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index cf7d964103fa..dba7bf01267a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43db595e8b5d78ce5ad2feab719814a76e3ad2e5 +refs/heads/master: a21a2fd4036f9a572415a7543896a1163c211ee5 diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig index f92602e86607..a4644f5ea98c 100644 --- a/trunk/arch/sparc/Kconfig +++ b/trunk/arch/sparc/Kconfig @@ -28,6 +28,7 @@ config SPARC select HAVE_GENERIC_HARDIRQS select GENERIC_IRQ_SHOW select USE_GENERIC_SMP_HELPERS if SMP + select GENERIC_PCI_IOMAP config SPARC32 def_bool !64BIT diff --git a/trunk/arch/sparc/include/asm/io_32.h b/trunk/arch/sparc/include/asm/io_32.h index c2ced21c9dc1..2006e5d359df 100644 --- a/trunk/arch/sparc/include/asm/io_32.h +++ b/trunk/arch/sparc/include/asm/io_32.h @@ -7,6 +7,7 @@ #include /* IO address mapping routines need this */ #include +#include #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) @@ -324,7 +325,6 @@ extern void ioport_unmap(void __iomem *); /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */ struct pci_dev; -extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); extern void pci_iounmap(struct pci_dev *dev, void __iomem *); /* diff --git a/trunk/arch/sparc/include/asm/io_64.h b/trunk/arch/sparc/include/asm/io_64.h index 9c8965415f0a..9481e5a6fa90 100644 --- a/trunk/arch/sparc/include/asm/io_64.h +++ b/trunk/arch/sparc/include/asm/io_64.h @@ -8,6 +8,7 @@ #include /* IO address mapping routines need this */ #include #include +#include /* PC crapola... */ #define __SLOW_DOWN_IO do { } while (0) @@ -514,7 +515,6 @@ extern void ioport_unmap(void __iomem *); /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */ struct pci_dev; -extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); extern void pci_iounmap(struct pci_dev *dev, void __iomem *); static inline int sbus_can_dma_64bit(void) diff --git a/trunk/arch/sparc/lib/iomap.c b/trunk/arch/sparc/lib/iomap.c index 9ef37e13a920..c4d42a50ebc0 100644 --- a/trunk/arch/sparc/lib/iomap.c +++ b/trunk/arch/sparc/lib/iomap.c @@ -18,31 +18,8 @@ void ioport_unmap(void __iomem *addr) EXPORT_SYMBOL(ioport_map); EXPORT_SYMBOL(ioport_unmap); -/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */ -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 (!len || !start) - return NULL; - if (maxlen && len > maxlen) - len = maxlen; - if (flags & IORESOURCE_IO) - return ioport_map(start, len); - if (flags & IORESOURCE_MEM) { - if (flags & IORESOURCE_CACHEABLE) - return ioremap(start, len); - return ioremap_nocache(start, len); - } - /* What? */ - return NULL; -} - void pci_iounmap(struct pci_dev *dev, void __iomem * addr) { /* nothing to do */ } -EXPORT_SYMBOL(pci_iomap); EXPORT_SYMBOL(pci_iounmap);