diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-09 23:54:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-10 23:07:41 -0700 |
| commit | d3ae4b5bc7186a53731d35187ad4ba3bca147cf6 (patch) | |
| tree | 53fbab0e70a170a3f6576e44e0b65fdbffe33258 /arch/sparc64/kernel/pci.c | |
| parent | ab138c031f72f6d030afa1a06a3a537e85ae843e (diff) | |
| download | talos-obmc-linux-d3ae4b5bc7186a53731d35187ad4ba3bca147cf6.tar.gz talos-obmc-linux-d3ae4b5bc7186a53731d35187ad4ba3bca147cf6.zip | |
sparc64: Get rid of pci_controller_info.
It is just used as a parent to encapsulate two PBM objects.
But that layout is only really relevant and necessary for
psycho PCI controllers, which unlike all the others share
a single IOMMU instance between sibling PCI busses.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/pci.c')
| -rw-r--r-- | arch/sparc64/kernel/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c index 8e18fdf32a60..3070f6faecca 100644 --- a/arch/sparc64/kernel/pci.c +++ b/arch/sparc64/kernel/pci.c @@ -977,14 +977,14 @@ int pcibus_to_node(struct pci_bus *pbus) EXPORT_SYMBOL(pcibus_to_node); #endif -/* Return the domain nuber for this pci bus */ +/* Return the domain number for this pci bus */ int pci_domain_nr(struct pci_bus *pbus) { struct pci_pbm_info *pbm = pbus->sysdata; int ret; - if (pbm == NULL || pbm->parent == NULL) { + if (!pbm) { ret = -ENXIO; } else { ret = pbm->index; |
