Those lines read:
sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
in Linus's current tree.
What are you patching against? That first argument is not
dev->dev.bus_id in any tree I have sitting here, it's always
pci_name() :-)
--