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

Commit d9efae36 authored by Alexander Chiang's avatar Alexander Chiang Committed by Len Brown
Browse files

ACPI: simplify acpi_pci_irq_del_prt() API 



There is no need to pass a segment/bus tuple to this API, as the callsite
always has a struct pci_bus. We can derive segment/bus from the
struct pci_bus, so let's take this opportunit to simplify the API and
make life easier for the callers.

Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Acked-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 859a3f86

drivers/acpi/pci_bind.c

+1 −2
Original line number Diff line number Diff line
@@ -113,8 +113,7 @@ static int acpi_pci_unbind(struct acpi_device *device) 
		return 0;



	if (dev->subordinate)

		acpi_pci_irq_del_prt(pci_domain_nr(dev->bus),

				     dev->subordinate->number);

		acpi_pci_irq_del_prt(dev->subordinate);



	pci_dev_put(dev);

	return 0;

drivers/acpi/pci_irq.c

+4 −3
Original line number Diff line number Diff line
@@ -280,16 +280,17 @@ int acpi_pci_irq_add_prt(acpi_handle handle, struct pci_bus *bus) 
	return 0;

}



void acpi_pci_irq_del_prt(int segment, int bus)

void acpi_pci_irq_del_prt(struct pci_bus *bus)

{

	struct acpi_prt_entry *entry, *tmp;



	printk(KERN_DEBUG

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

	       segment, bus);

	       pci_domain_nr(bus), bus->number);

	spin_lock(&acpi_prt_lock);

	list_for_each_entry_safe(entry, tmp, &acpi_prt_list, list) {

		if (segment == entry->id.segment && bus == entry->id.bus) {

		if (pci_domain_nr(bus) == entry->id.segment

			&& bus->number == entry->id.bus) {

			list_del(&entry->list);

			kfree(entry);

		}

include/acpi/acpi_drivers.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ int acpi_pci_link_free_irq(acpi_handle handle); 
/* ACPI PCI Interrupt Routing (pci_irq.c) */



int acpi_pci_irq_add_prt(acpi_handle handle, struct pci_bus *bus);

void acpi_pci_irq_del_prt(int segment, int bus);

void acpi_pci_irq_del_prt(struct pci_bus *bus);



/* ACPI PCI Device Binding (pci_bind.c) */