|
@@ -1121,7 +1121,7 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
|
|
|
unsigned int devfn, pass, max = bus->secondary;
|
|
|
struct pci_dev *dev;
|
|
|
|
|
|
- pr_debug("PCI: Scanning bus %04x:%02x\n", pci_domain_nr(bus), bus->number);
|
|
|
+ dev_dbg(&bus->dev, "scanning bus\n");
|
|
|
|
|
|
/* Go find them, Rover! */
|
|
|
for (devfn = 0; devfn < 0x100; devfn += 8)
|
|
@@ -1135,8 +1135,7 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
|
|
|
* all PCI-to-PCI bridges on this bus.
|
|
|
*/
|
|
|
if (!bus->is_added) {
|
|
|
- pr_debug("PCI: Fixups for bus %04x:%02x\n",
|
|
|
- pci_domain_nr(bus), bus->number);
|
|
|
+ dev_dbg(&bus->dev, "fixups for bus\n");
|
|
|
pcibios_fixup_bus(bus);
|
|
|
if (pci_is_root_bus(bus))
|
|
|
bus->is_added = 1;
|
|
@@ -1156,8 +1155,7 @@ unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
|
|
|
*
|
|
|
* Return how far we've got finding sub-buses.
|
|
|
*/
|
|
|
- pr_debug("PCI: Bus scan for %04x:%02x returning with max=%02x\n",
|
|
|
- pci_domain_nr(bus), bus->number, max);
|
|
|
+ dev_dbg(&bus->dev, "bus scan returning with max=%02x\n", max);
|
|
|
return max;
|
|
|
}
|
|
|
|
|
@@ -1165,7 +1163,7 @@ struct pci_bus * pci_create_bus(struct device *parent,
|
|
|
int bus, struct pci_ops *ops, void *sysdata)
|
|
|
{
|
|
|
int error;
|
|
|
- struct pci_bus *b;
|
|
|
+ struct pci_bus *b, *b2;
|
|
|
struct device *dev;
|
|
|
|
|
|
b = pci_alloc_bus();
|
|
@@ -1181,9 +1179,10 @@ struct pci_bus * pci_create_bus(struct device *parent,
|
|
|
b->sysdata = sysdata;
|
|
|
b->ops = ops;
|
|
|
|
|
|
- if (pci_find_bus(pci_domain_nr(b), bus)) {
|
|
|
+ b2 = pci_find_bus(pci_domain_nr(b), bus);
|
|
|
+ if (b2) {
|
|
|
/* If we already got to this bus through a different bridge, ignore it */
|
|
|
- pr_debug("PCI: Bus %04x:%02x already known\n", pci_domain_nr(b), bus);
|
|
|
+ dev_dbg(&b2->dev, "bus already known\n");
|
|
|
goto err_out;
|
|
|
}
|
|
|
|