aboutsummaryrefslogtreecommitdiff
path: root/include/asm-powerpc/pci.h
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-06-27 01:17:57 -0500
committerKumar Gala <galak@kernel.crashing.org>2007-06-29 01:58:37 -0500
commit5516b540e98de6f7474a4e7149470ad6a0bbc54a (patch)
tree9eb57336d892eb8c0e76584285030868df82f626 /include/asm-powerpc/pci.h
parent6a506238b33efd93e60c1585d654b37e292183de (diff)
[POWERPC] Use global_number in ppc32 pci_controller
Make the pci_controller struct use global_number for the PHB domain number instead of index to match what ppc64 does and reuse its pci_domain_nr code. Introduced a pci-common.c to handle shared code between ppc32 & ppc64. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'include/asm-powerpc/pci.h')
-rw-r--r--include/asm-powerpc/pci.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/asm-powerpc/pci.h b/include/asm-powerpc/pci.h
index 93e3752df6b..0cd3e77efd2 100644
--- a/include/asm-powerpc/pci.h
+++ b/include/asm-powerpc/pci.h
@@ -107,8 +107,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
#define get_pci_dma_ops() NULL
#endif
-extern int pci_domain_nr(struct pci_bus *bus);
-
/* Decide whether to display the domain number in /proc */
extern int pci_proc_domain(struct pci_bus *bus);
@@ -130,9 +128,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
*/
#define pci_dac_dma_supported(pci_dev, mask) (0)
-/* Return the index of the PCI controller for device PDEV. */
-#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
-
/* Set the name of the bus as it appears in /proc/bus/pci */
static inline int pci_proc_domain(struct pci_bus *bus)
{
@@ -141,6 +136,8 @@ static inline int pci_proc_domain(struct pci_bus *bus)
#endif /* CONFIG_PPC64 */
+extern int pci_domain_nr(struct pci_bus *bus);
+
struct vm_area_struct;
/* Map a range of PCI memory or I/O space for a device into user space */
int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma,