Skip to content

Commit

Permalink
PCI: uninline pci_ioremap_bar()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Morton authored and Jesse Barnes committed Jan 7, 2009
1 parent bebd590 commit 1684f5d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 14 deletions.
16 changes: 16 additions & 0 deletions drivers/pci/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,22 @@ unsigned char pci_bus_max_busnr(struct pci_bus* bus)
}
EXPORT_SYMBOL_GPL(pci_bus_max_busnr);

#ifdef CONFIG_HAS_IOMEM
void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
{
/*
* Make sure the BAR is actually a memory resource, not an IO resource
*/
if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) {
WARN_ON(1);
return NULL;
}
return ioremap_nocache(pci_resource_start(pdev, bar),
pci_resource_len(pdev, bar));
}
EXPORT_SYMBOL_GPL(pci_ioremap_bar);
#endif

#if 0
/**
* pci_max_busnr - returns maximum PCI bus number
Expand Down
15 changes: 1 addition & 14 deletions include/linux/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -1160,20 +1160,7 @@ static inline void pci_mmcfg_late_init(void) { }

int pci_ext_cfg_avail(struct pci_dev *dev);

#ifdef CONFIG_HAS_IOMEM
static inline void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
{
/*
* Make sure the BAR is actually a memory resource, not an IO resource
*/
if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) {
WARN_ON(1);
return NULL;
}
return ioremap_nocache(pci_resource_start(pdev, bar),
pci_resource_len(pdev, bar));
}
#endif
void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);

#endif /* __KERNEL__ */
#endif /* LINUX_PCI_H */

0 comments on commit 1684f5d

Please sign in to comment.