From patchwork Mon Jan 28 18:56:15 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v2, 06/27] lib: devres: don't enclose pcim_*() functions in
 CONFIG_HAS_IOPORT
Date: Mon, 28 Jan 2013 08:56:15 -0000
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
X-Patchwork-Id: 216308
Message-Id: <1359399397-29729-7-git-send-email-thomas.petazzoni@free-electrons.com>
To: Bjorn Helgaas <bhelgaas@google.com>, linux-pci@vger.kernel.org,
 linux-arm-kernel@lists.infradead.org
Cc: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
 Gregory Clement <gregory.clement@free-electrons.com>,
 Arnd Bergmann <arnd@arndb.de>, Maen Suleiman <maen@marvell.com>,
 Lior Amsalem <alior@marvell.com>,
 Thierry Reding <thierry.reding@avionic-design.de>,
 Eran Ben-Avi <benavi@marvell.com>, Nadav Haklai <nadavh@marvell.com>,
 Shadi Ammouri <shadi@marvell.com>, Tawfik Bayouk <tawfik@marvell.com>,
 Stephen Warren <swarren@wwwdotorg.org>,
 Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
 Russell King - ARM Linux <linux@arm.linux.org.uk>,
 Paul Gortmaker <paul.gortmaker@windriver.com>,
 Jesse Barnes <jbarnes@virtuousgeek.org>,
 Yinghai Lu <yinghai@kernel.org>, linux-kernel@vger.kernel.org

The pcim_*() functions are used by the libata-sff subsystem, and this
subsystem is used for many SATA drivers on ARM platforms that do not
necessarily have I/O ports.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-kernel@vger.kernel.org

---
lib/devres.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/devres.c b/lib/devres.c
index 80b9c76..5639c3e 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -195,6 +195,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
 			       devm_ioport_map_match, (void *)addr));
 }
 EXPORT_SYMBOL(devm_ioport_unmap);
+#endif /* CONFIG_HAS_IOPORT */
 
 #ifdef CONFIG_PCI
 /*
@@ -400,4 +401,3 @@ void pcim_iounmap_regions(struct pci_dev *pdev, int mask)
 }
 EXPORT_SYMBOL(pcim_iounmap_regions);
 #endif /* CONFIG_PCI */
-#endif /* CONFIG_HAS_IOPORT */