aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-12-08 23:30:05 -0500
committerLen Brown <len.brown@intel.com>2008-12-30 21:08:42 -0500
commit21a53283a012f21764f2aaaac9414849e1153d93 (patch)
treefd63dee52fbdd8bb10b318c06606382b05545cf5 /drivers/acpi
parent4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff)
ACPI: PCI: use conventional PCI address format
Use the conventional format for PCI addresses (%04x:%02x:%02x.%d). Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/pci_bind.c12
-rw-r--r--drivers/acpi/pci_irq.c10
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 4b252ea0e952..53f502d29b32 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -99,7 +99,7 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id)
99 */ 99 */
100 100
101 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 101 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
102 "Device %s has PCI address %02x:%02x:%02x.%02x\n", 102 "Device %s has PCI address %04x:%02x:%02x.%d\n",
103 acpi_device_bid(device), id->segment, id->bus, 103 acpi_device_bid(device), id->segment, id->bus,
104 id->device, id->function)); 104 id->device, id->function));
105 105
@@ -166,7 +166,7 @@ int acpi_pci_bind(struct acpi_device *device)
166 data->id.device = device->pnp.bus_address >> 16; 166 data->id.device = device->pnp.bus_address >> 16;
167 data->id.function = device->pnp.bus_address & 0xFFFF; 167 data->id.function = device->pnp.bus_address & 0xFFFF;
168 168
169 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "...to %02x:%02x:%02x.%02x\n", 169 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "...to %04x:%02x:%02x.%d\n",
170 data->id.segment, data->id.bus, data->id.device, 170 data->id.segment, data->id.bus, data->id.device,
171 data->id.function)); 171 data->id.function));
172 172
@@ -196,7 +196,7 @@ int acpi_pci_bind(struct acpi_device *device)
196 } 196 }
197 if (!data->dev) { 197 if (!data->dev) {
198 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 198 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
199 "Device %02x:%02x:%02x.%02x not present in PCI namespace\n", 199 "Device %04x:%02x:%02x.%d not present in PCI namespace\n",
200 data->id.segment, data->id.bus, 200 data->id.segment, data->id.bus,
201 data->id.device, data->id.function)); 201 data->id.device, data->id.function));
202 result = -ENODEV; 202 result = -ENODEV;
@@ -204,7 +204,7 @@ int acpi_pci_bind(struct acpi_device *device)
204 } 204 }
205 if (!data->dev->bus) { 205 if (!data->dev->bus) {
206 printk(KERN_ERR PREFIX 206 printk(KERN_ERR PREFIX
207 "Device %02x:%02x:%02x.%02x has invalid 'bus' field\n", 207 "Device %04x:%02x:%02x.%d has invalid 'bus' field\n",
208 data->id.segment, data->id.bus, 208 data->id.segment, data->id.bus,
209 data->id.device, data->id.function); 209 data->id.device, data->id.function);
210 result = -ENODEV; 210 result = -ENODEV;
@@ -219,7 +219,7 @@ int acpi_pci_bind(struct acpi_device *device)
219 */ 219 */
220 if (data->dev->subordinate) { 220 if (data->dev->subordinate) {
221 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 221 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
222 "Device %02x:%02x:%02x.%02x is a PCI bridge\n", 222 "Device %04x:%02x:%02x.%d is a PCI bridge\n",
223 data->id.segment, data->id.bus, 223 data->id.segment, data->id.bus,
224 data->id.device, data->id.function)); 224 data->id.device, data->id.function));
225 data->bus = data->dev->subordinate; 225 data->bus = data->dev->subordinate;
@@ -353,7 +353,7 @@ acpi_pci_bind_root(struct acpi_device *device,
353 acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer); 353 acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
354 354
355 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Binding PCI root bridge [%s] to " 355 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Binding PCI root bridge [%s] to "
356 "%02x:%02x\n", pathname, id->segment, id->bus)); 356 "%04x:%02x\n", pathname, id->segment, id->bus));
357 357
358 status = acpi_attach_data(device->handle, acpi_pci_data_handler, data); 358 status = acpi_attach_data(device->handle, acpi_pci_data_handler, data);
359 if (ACPI_FAILURE(status)) { 359 if (ACPI_FAILURE(status)) {
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 11acaee14d66..63a132609991 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -222,7 +222,7 @@ acpi_pci_irq_add_entry(acpi_handle handle,
222 entry->link.index = prt->source_index; 222 entry->link.index = prt->source_index;
223 223
224 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INFO, 224 ACPI_DEBUG_PRINT_RAW((ACPI_DB_INFO,
225 " %02X:%02X:%02X[%c] -> %s[%d]\n", 225 " %04x:%02x:%02x[%c] -> %s[%d]\n",
226 entry->id.segment, entry->id.bus, 226 entry->id.segment, entry->id.bus,
227 entry->id.device, ('A' + entry->pin), prt->source, 227 entry->id.device, ('A' + entry->pin), prt->source,
228 entry->link.index)); 228 entry->link.index));
@@ -328,8 +328,8 @@ void acpi_pci_irq_del_prt(int segment, int bus)
328 } 328 }
329 329
330 printk(KERN_DEBUG 330 printk(KERN_DEBUG
331 "ACPI: Delete PCI Interrupt Routing Table for %x:%x\n", segment, 331 "ACPI: Delete PCI Interrupt Routing Table for %04x:%02x\n",
332 bus); 332 segment, bus);
333 spin_lock(&acpi_prt_lock); 333 spin_lock(&acpi_prt_lock);
334 list_for_each_safe(node, n, &acpi_prt.entries) { 334 list_for_each_safe(node, n, &acpi_prt.entries) {
335 entry = list_entry(node, struct acpi_prt_entry, node); 335 entry = list_entry(node, struct acpi_prt_entry, node);
@@ -403,12 +403,12 @@ acpi_pci_irq_lookup(struct pci_bus *bus,
403 403
404 404
405 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 405 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
406 "Searching for PRT entry for %02x:%02x:%02x[%c]\n", 406 "Searching for _PRT entry for %04x:%02x:%02x[%c]\n",
407 segment, bus_nr, device, ('A' + pin))); 407 segment, bus_nr, device, ('A' + pin)));
408 408
409 entry = acpi_pci_irq_find_prt_entry(segment, bus_nr, device, pin); 409 entry = acpi_pci_irq_find_prt_entry(segment, bus_nr, device, pin);
410 if (!entry) { 410 if (!entry) {
411 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "PRT entry not found\n")); 411 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "_PRT entry not found\n"));
412 return -1; 412 return -1;
413 } 413 }
414 414