aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-12-01 17:30:30 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-01-07 14:12:57 -0500
commit1684f5ddd4c0c754f52c78eaa2c5c69ad09fb18c (patch)
tree1085974a81fba002bcc05cdd88a11134ec13799c
parentbebd590ca27e80ffe3129ab4f0a3124f0a340f43 (diff)
PCI: uninline pci_ioremap_bar()
It's too large to be inlined. Acked-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r--drivers/pci/pci.c16
-rw-r--r--include/linux/pci.h15
2 files changed, 17 insertions, 14 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 1fb7cff4cdae..9354dd63f035 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -56,6 +56,22 @@ unsigned char pci_bus_max_busnr(struct pci_bus* bus)
56} 56}
57EXPORT_SYMBOL_GPL(pci_bus_max_busnr); 57EXPORT_SYMBOL_GPL(pci_bus_max_busnr);
58 58
59#ifdef CONFIG_HAS_IOMEM
60void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
61{
62 /*
63 * Make sure the BAR is actually a memory resource, not an IO resource
64 */
65 if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) {
66 WARN_ON(1);
67 return NULL;
68 }
69 return ioremap_nocache(pci_resource_start(pdev, bar),
70 pci_resource_len(pdev, bar));
71}
72EXPORT_SYMBOL_GPL(pci_ioremap_bar);
73#endif
74
59#if 0 75#if 0
60/** 76/**
61 * pci_max_busnr - returns maximum PCI bus number 77 * pci_max_busnr - returns maximum PCI bus number
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 58357d14f94c..0d8bc920c2e5 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1160,20 +1160,7 @@ static inline void pci_mmcfg_late_init(void) { }
1160 1160
1161int pci_ext_cfg_avail(struct pci_dev *dev); 1161int pci_ext_cfg_avail(struct pci_dev *dev);
1162 1162
1163#ifdef CONFIG_HAS_IOMEM 1163void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
1164static inline void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
1165{
1166 /*
1167 * Make sure the BAR is actually a memory resource, not an IO resource
1168 */
1169 if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) {
1170 WARN_ON(1);
1171 return NULL;
1172 }
1173 return ioremap_nocache(pci_resource_start(pdev, bar),
1174 pci_resource_len(pdev, bar));
1175}
1176#endif
1177 1164
1178#endif /* __KERNEL__ */ 1165#endif /* __KERNEL__ */
1179#endif /* LINUX_PCI_H */ 1166#endif /* LINUX_PCI_H */