ACPI: print PCI root names the same way the rest of the kernel does

PATCH Applied Bjorn Helgaas 2 participants 2 messages Feb 18, 2005 – Mar 9, 2005

Subsystems (2)

ACPI PCI

lore

Share & tools

lore

Bjorn Helgaas

author

2005-02-18 23:15 UTC #0 lore raw

PATCH 1/1 ACPI: print PCI root names the same way the rest of the kernel does

The rest of the kernel uses %04x:%02x for PCI domain:bus; ACPI should do the same.

Signed-off-by Bjorn Helgaas <[email protected]>

===== drivers/acpi/pci_root.c 1.23 vs edited =====

drivers/acpi/pci_root.c +2 -2

@@ -258,7 +258,7 @@
  	/* TBD: Locking */
  	list_add_tail(&root->node, &acpi_pci_roots);
 
-	printk(KERN_INFO PREFIX "%s [%s] (%02x:%02x)\n", 
+	printk(KERN_INFO PREFIX "%s [%s] (%04x:%02x)\n", 
 		acpi_device_name(device), acpi_device_bid(device),
 		root->id.segment, root->id.bus);

@@ -272,7 +272,7 @@
 	root->bus = pci_acpi_scan_root(device, root->id.segment, root->id.bus);
 	if (!root->bus) {
 		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
-			"Bus %02x:%02x not present in PCI namespace\n", 
+			"Bus %04x:%02x not present in PCI namespace\n", 
 			root->id.segment, root->id.bus));
 		result = -ENODEV;
 		goto end;

-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

Len Brown

Applied

2005-03-09 05:22 UTC #1 lore raw

Re: [PATCH] ACPI: print PCI root names the same way the rest of thekernel does

Applied.

thanks,
-Len

Quoted 26 lines · Bjorn Helgaas

The rest of the kernel uses %04x:%02x for PCI domain:bus; ACPI should do the same.

Signed-off-by Bjorn Helgaas <[email protected]>

===== drivers/acpi/pci_root.c 1.23 vs edited =====

drivers/acpi/pci_root.c 2005-02-15 14:10:14 -07:00 renamed from drivers/acpi/pci_root.c 2004-11-11 23:29:46 -07:00 +2 -2

@@ -258,7 +258,7 @@
        /* TBD: Locking */
        list_add_tail(&root->node, &acpi_pci_roots);
 
-       printk(KERN_INFO PREFIX "%s [%s] (%02x:%02x)\n",
+       printk(KERN_INFO PREFIX "%s [%s] (%04x:%02x)\n",
                acpi_device_name(device), acpi_device_bid(device),
                root->id.segment, root->id.bus);

@@ -272,7 +272,7 @@
        root->bus = pci_acpi_scan_root(device, root->id.segment,
 root->id.bus);
        if (!root->bus) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Bus %02x:%02x not present in PCI
 namespace\n",
+                       "Bus %04x:%02x not present in PCI
 namespace\n",

Quoted 7 lines

                        root->id.segment, root->id.bus));
                result = -ENODEV;
                goto end;