Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a6bed83 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

x86/PCI: print domain:bus in conventional format 



Use the dev_printk-like "%04x:%02x" format for printing PCI bus numbers.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 10c3d71d

arch/x86/pci/acpi.c

+5 −3
Original line number Diff line number Diff line
@@ -172,8 +172,9 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do 
#endif



	if (domain && !pci_domains_supported) {

		printk(KERN_WARNING "PCI: Multiple domains not supported "

		       "(dom %d, bus %d)\n", domain, busnum);

		printk(KERN_WARNING "pci_bus %04x:%02x: "

		       "ignored (multiple domains not supported)\n",

		       domain, busnum);

		return NULL;

	}
@@ -197,7 +198,8 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do 
	 */

	sd = kzalloc(sizeof(*sd), GFP_KERNEL);

	if (!sd) {

		printk(KERN_ERR "PCI: OOM, not probing PCI bus %02x\n", busnum);

		printk(KERN_WARNING "pci_bus %04x:%02x: "

		       "ignored (out of memory)\n", domain, busnum);

		return NULL;

	}