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

Commit 21a53283 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: PCI: use conventional PCI address format 



Use the conventional format for PCI addresses (%04x:%02x:%02x.%d).

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 4a6908a3

drivers/acpi/pci_bind.c

+6 −6
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id) 
	 */



	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

			  "Device %s has PCI address %02x:%02x:%02x.%02x\n",

			  "Device %s has PCI address %04x:%02x:%02x.%d\n",

			  acpi_device_bid(device), id->segment, id->bus,

			  id->device, id->function));
@@ -166,7 +166,7 @@ int acpi_pci_bind(struct acpi_device *device) 
	data->id.device = device->pnp.bus_address >> 16;

	data->id.function = device->pnp.bus_address & 0xFFFF;



	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "...to %02x:%02x:%02x.%02x\n",

	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "...to %04x:%02x:%02x.%d\n",

			  data->id.segment, data->id.bus, data->id.device,

			  data->id.function));
@@ -196,7 +196,7 @@ int acpi_pci_bind(struct acpi_device *device) 
	}

	if (!data->dev) {

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

				  "Device %02x:%02x:%02x.%02x not present in PCI namespace\n",

				  "Device %04x:%02x:%02x.%d not present in PCI namespace\n",

				  data->id.segment, data->id.bus,

				  data->id.device, data->id.function));

		result = -ENODEV;
@@ -204,7 +204,7 @@ int acpi_pci_bind(struct acpi_device *device) 
	}

	if (!data->dev->bus) {

		printk(KERN_ERR PREFIX

			    "Device %02x:%02x:%02x.%02x has invalid 'bus' field\n",

			    "Device %04x:%02x:%02x.%d has invalid 'bus' field\n",

			    data->id.segment, data->id.bus,

			    data->id.device, data->id.function);

		result = -ENODEV;
@@ -219,7 +219,7 @@ int acpi_pci_bind(struct acpi_device *device) 
	 */

	if (data->dev->subordinate) {

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,

				  "Device %02x:%02x:%02x.%02x is a PCI bridge\n",

				  "Device %04x:%02x:%02x.%d is a PCI bridge\n",

				  data->id.segment, data->id.bus,

				  data->id.device, data->id.function));

		data->bus = data->dev->subordinate;
@@ -353,7 +353,7 @@ acpi_pci_bind_root(struct acpi_device *device, 
	acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);



	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Binding PCI root bridge [%s] to "

			  "%02x:%02x\n", pathname, id->segment, id->bus));

			  "%04x:%02x\n", pathname, id->segment, id->bus));



	status = acpi_attach_data(device->handle, acpi_pci_data_handler, data);

	if (ACPI_FAILURE(status)) {

drivers/acpi/pci_irq.c

+5 −5
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ acpi_pci_irq_add_entry(acpi_handle handle, 
		entry->link.index = prt->source_index;



	ACPI_DEBUG_PRINT_RAW((ACPI_DB_INFO,

			      "      %02X:%02X:%02X[%c] -> %s[%d]\n",

			      "      %04x:%02x:%02x[%c] -> %s[%d]\n",

			      entry->id.segment, entry->id.bus,

			      entry->id.device, ('A' + entry->pin), prt->source,

			      entry->link.index));
@@ -328,8 +328,8 @@ void acpi_pci_irq_del_prt(int segment, int bus) 
	}



	printk(KERN_DEBUG

	       "ACPI: Delete PCI Interrupt Routing Table for %x:%x\n", segment,

	       bus);

	       "ACPI: Delete PCI Interrupt Routing Table for %04x:%02x\n",

	       segment, bus);

	spin_lock(&acpi_prt_lock);

	list_for_each_safe(node, n, &acpi_prt.entries) {

		entry = list_entry(node, struct acpi_prt_entry, node);
@@ -403,12 +403,12 @@ acpi_pci_irq_lookup(struct pci_bus *bus, 




	ACPI_DEBUG_PRINT((ACPI_DB_INFO,

			  "Searching for PRT entry for %02x:%02x:%02x[%c]\n",

			  "Searching for _PRT entry for %04x:%02x:%02x[%c]\n",

			  segment, bus_nr, device, ('A' + pin)));



	entry = acpi_pci_irq_find_prt_entry(segment, bus_nr, device, pin);

	if (!entry) {

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "PRT entry not found\n"));

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "_PRT entry not found\n"));

		return -1;

	}