diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2009-11-04 12:32:47 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-11-04 16:06:43 -0500 |
commit | 2a6bed8301f8b019717504575a3f9c6cce1fe271 (patch) | |
tree | ff7abcaf54d90250620813e10ef875a0f0053cdf /arch | |
parent | 10c3d71d42f341775d96187eedd3e50eb34939d0 (diff) |
x86/PCI: print domain:bus in conventional format
Use the dev_printk-like "%04x:%02x" format for printing PCI bus numbers.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/pci/acpi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 6bf8091d2fd..68b89dc7d76 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c | |||
@@ -172,8 +172,9 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do | |||
172 | #endif | 172 | #endif |
173 | 173 | ||
174 | if (domain && !pci_domains_supported) { | 174 | if (domain && !pci_domains_supported) { |
175 | printk(KERN_WARNING "PCI: Multiple domains not supported " | 175 | printk(KERN_WARNING "pci_bus %04x:%02x: " |
176 | "(dom %d, bus %d)\n", domain, busnum); | 176 | "ignored (multiple domains not supported)\n", |
177 | domain, busnum); | ||
177 | return NULL; | 178 | return NULL; |
178 | } | 179 | } |
179 | 180 | ||
@@ -197,7 +198,8 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do | |||
197 | */ | 198 | */ |
198 | sd = kzalloc(sizeof(*sd), GFP_KERNEL); | 199 | sd = kzalloc(sizeof(*sd), GFP_KERNEL); |
199 | if (!sd) { | 200 | if (!sd) { |
200 | printk(KERN_ERR "PCI: OOM, not probing PCI bus %02x\n", busnum); | 201 | printk(KERN_WARNING "pci_bus %04x:%02x: " |
202 | "ignored (out of memory)\n", domain, busnum); | ||
201 | return NULL; | 203 | return NULL; |
202 | } | 204 | } |
203 | 205 | ||