summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/pci_root.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-02-19 11:42:17 -0700
committerBjorn Helgaas <bhelgaas@google.com>2013-02-19 11:42:17 -0700
commit018ba0a6efada61b9bc17500101d81c3d35807c2 (patch)
tree13361ad9197c5021841a0ccf0bfb1dabfd6d424e /drivers/acpi/pci_root.c
parentfd5e20bcb465e8d69a6fda617a7b35fb5f8d4eb1 (diff)
parent181380b702eee1a9aca51354d7b87c7b08541fcf (diff)
downloadop-kernel-dev-018ba0a6efada61b9bc17500101d81c3d35807c2.zip
op-kernel-dev-018ba0a6efada61b9bc17500101d81c3d35807c2.tar.gz
Merge branch 'pci/yinghai-root-bus-hotplug' into next
* pci/yinghai-root-bus-hotplug: PCI/ACPI: Don't cache _PRT, and don't associate them with bus numbers
Diffstat (limited to 'drivers/acpi/pci_root.c')
-rw-r--r--drivers/acpi/pci_root.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 417487a..8b5a73b 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -416,7 +416,6 @@ static int acpi_pci_root_add(struct acpi_device *device)
acpi_status status;
int result;
struct acpi_pci_root *root;
- acpi_handle handle;
struct acpi_pci_driver *driver;
u32 flags, base_flags;
bool is_osc_granted = false;
@@ -471,16 +470,6 @@ static int acpi_pci_root_add(struct acpi_device *device)
acpi_device_name(device), acpi_device_bid(device),
root->segment, &root->secondary);
- /*
- * PCI Routing Table
- * -----------------
- * Evaluate and parse _PRT, if exists.
- */
- status = acpi_get_handle(device->handle, METHOD_NAME__PRT, &handle);
- if (ACPI_SUCCESS(status))
- result = acpi_pci_irq_add_prt(device->handle, root->segment,
- root->secondary.start);
-
root->mcfg_addr = acpi_pci_root_get_mcfg_addr(device->handle);
/*
@@ -605,7 +594,6 @@ out_del_root:
list_del(&root->node);
mutex_unlock(&acpi_pci_root_lock);
- acpi_pci_irq_del_prt(root->segment, root->secondary.start);
end:
kfree(root);
return result;
@@ -613,8 +601,6 @@ end:
static int acpi_pci_root_remove(struct acpi_device *device, int type)
{
- acpi_status status;
- acpi_handle handle;
struct acpi_pci_root *root = acpi_driver_data(device);
struct acpi_pci_driver *driver;
@@ -629,10 +615,6 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type)
device_set_run_wake(root->bus->bridge, false);
pci_acpi_remove_bus_pm_notifier(device);
- status = acpi_get_handle(device->handle, METHOD_NAME__PRT, &handle);
- if (ACPI_SUCCESS(status))
- acpi_pci_irq_del_prt(root->segment, root->secondary.start);
-
pci_remove_root_bus(root->bus);
mutex_lock(&acpi_pci_root_lock);
OpenPOWER on IntegriCloud