mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCHv2 RFC (repost) 09/16] sh: switch to GENERIC_PCI_IOMAP
Date: Wed, 21 Dec 2011 18:29:46 +0200	[thread overview]
Message-ID: <d026a1bc20c876b553d69224e16c35b70ef0b57c.1324484752.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1324484752.git.mst@redhat.com>

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>
Acked-by: Paul Mundt <lethal@linux-sh.org>
---
 arch/sh/Kconfig           |    1 +
 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);
-- 
1.7.8.382.g3daff


  parent reply	other threads:[~2011-12-21 16:27 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 ` Michael S. Tsirkin [this message]
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 ` [PATCHv2 RFC (repost) 07/16] parisc: " Michael S. Tsirkin
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=d026a1bc20c876b553d69224e16c35b70ef0b57c.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®