From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by ozlabs.org (Postfix) with ESMTP id 7D31E1007D7 for ; Fri, 25 Nov 2011 07:19:56 +1100 (EST) Date: Thu, 24 Nov 2011 22:20:37 +0200 From: "Michael S. Tsirkin" Subject: [PATCH-RFC 09/10] sh: switch to GENERIC_PCI_IOMAP Message-ID: <28d52b292971f1bc6dab66ad6f27a0dbce35a9c0.1322163031.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: Cc: Nicolas Pitre , linux-mips@linux-mips.org, linux-m68k@vger.kernel.org, linux-ia64@vger.kernel.org, "Michael S. Tsirkin" , linux@openrisc.net, linux-pci@vger.kernel.org, Jesse Barnes , Chen Liqin , Paul Mackerras , "H. Peter Anvin" , sparclinux@vger.kernel.org, Guan Xuetao , Lennox Wu , Jonas Bonn , Jesper Nilsson , Russell King , linux-sh@vger.kernel.org, linux-hexagon@vger.kernel.org, Helge Deller , x86@kernel.org, "James E.J. Bottomley" , Ingo Molnar , Geert Uytterhoeven , linux-arch@vger.kernel.org, Arend van Spriel , Matt Turner , Fenghua Yu , Lasse Collin , Arnd Bergmann , Lucas De Marchi , microblaze-uclinux@itee.uq.edu.au, Paul Bolle , Rob Herring , Mikael Starvik , Ivan Kokshaysky , Franky Lin , Thomas Gleixner , Fabio Baltieri , linux-arm-kernel@lists.infradead.org, Richard Henderson , Michael Ellerman , Michal Simek , Tony Luck , linux-parisc@vger.kernel.org, linux-cris-kernel@axis.com, Paul Gortmaker , linux-kernel@vger.kernel.org, Ralf Baechle , Richard Kuo , Kyle McMartin , Paul Mundt , linux-alpha@vger.kernel.org, Olof Johansson , Andrew Morton , linuxppc-dev@lists.ozlabs.org, "David S. Miller" List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 --- 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.5.53.gc233e