Merge cheetah:src/BK/sparc-2.5

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

arch/sparc64/kernel/pci.c

@@ -804,13 +804,11 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 
 /* Return the domain nuber for this pci bus */
 
-int pci_domain_nr(struct pci_bus *bus)
+int pci_domain_nr(struct pci_bus *pbus)
 {
-	struct pcidev_cookie *cookie = bus->sysdata;
+	struct pci_pbm_info *pbm = pbus->sysdata;
 	int ret;
 
-	if (cookie != NULL) {
-		struct pci_pbm_info *pbm = cookie->pbm;
 	if (pbm == NULL || pbm->parent == NULL) {
 		ret = -ENXIO;
 	} else {
@@ -821,9 +819,6 @@ int pci_domain_nr(struct pci_bus *bus)
 			ret = ((ret << 1) +
 			       ((pbm == &pbm->parent->pbm_B) ? 1 : 0));
 	}
-	} else {
-		ret = -ENXIO;
-	}
 
 	return ret;
 }