From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCHv2 RFC (repost) 07/16] parisc: switch to GENERIC_PCI_IOMAP
Date: Wed, 21 Dec 2011 18:29:55 +0200 [thread overview]
Message-ID: <cc7ac97aaa52fa5184ec9e17e7b7b86e3aab219d.1324484752.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1324484752.git.mst@redhat.com>
parisc 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>
---
arch/parisc/Kconfig | 1 +
arch/parisc/lib/iomap.c | 23 -----------------------
2 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index fdfd8be..242a1b7 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -14,6 +14,7 @@ config PARISC
select GENERIC_ATOMIC64 if !64BIT
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_PROBE
+ select GENERIC_PCI_IOMAP
select IRQ_PER_CPU
select ARCH_HAVE_NMI_SAFE_CMPXCHG
diff --git a/arch/parisc/lib/iomap.c b/arch/parisc/lib/iomap.c
index 8f470c9..fb8e10a 100644
--- a/arch/parisc/lib/iomap.c
+++ b/arch/parisc/lib/iomap.c
@@ -436,28 +436,6 @@ void ioport_unmap(void __iomem *addr)
}
}
-/* 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)
{
if (!INDIRECT_ADDR(addr)) {
@@ -483,5 +461,4 @@ EXPORT_SYMBOL(iowrite16_rep);
EXPORT_SYMBOL(iowrite32_rep);
EXPORT_SYMBOL(ioport_map);
EXPORT_SYMBOL(ioport_unmap);
-EXPORT_SYMBOL(pci_iomap);
EXPORT_SYMBOL(pci_iounmap);
--
1.7.8.382.g3daff
next prev parent reply other threads:[~2011-12-21 16:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-21 16:29 [PATCHv2 RFC (repost) 00/16] pci: use generic pci_iomap on all architectures Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 01/16] lib: move GENERIC_IOMAP to lib/Kconfig Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 02/16] lib: add GENERIC_PCI_IOMAP Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 03/16] alpha: switch to GENERIC_PCI_IOMAP Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 04/16] arm: " Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 05/16] microblaze: " Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 08/16] powerpc: " Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 06/16] mips: " Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 09/16] sh: " Michael S. Tsirkin
2011-12-21 16:29 ` [PATCHv2 RFC (repost) 10/16] sparc: " Michael S. Tsirkin
2011-12-21 20:39 ` David Miller
2011-12-22 8:26 ` Michael S. Tsirkin
2011-12-21 16:29 ` Michael S. Tsirkin [this message]
2011-12-21 16:30 ` [PATCHv2 RFC (repost) 11/16] tile: don't panic on iomap Michael S. Tsirkin
2011-12-21 16:30 ` [PATCHv2 RFC (repost) 12/16] tile: switch to GENERIC_PCI_IOMAP Michael S. Tsirkin
2011-12-21 16:30 ` [PATCHv2 RFC (repost) 13/16] frv: " Michael S. Tsirkin
2011-12-21 16:30 ` [PATCHv2 RFC (repost) 15/16] mn10300: " Michael S. Tsirkin
2011-12-21 16:30 ` [PATCHv2 RFC (repost) 14/16] mn10300: add missing __iomap markers Michael S. Tsirkin
2011-12-21 16:30 ` [PATCHv2 RFC (repost) 16/16] alpha: drop pci_iomap/pci_iounmap from pci-noop.c Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cc7ac97aaa52fa5184ec9e17e7b7b86e3aab219d.1324484752.git.mst@redhat.com \
--to=mst@redhat.com \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.