diff options
| author | Dave Airlie | 2017-03-23 03:05:13 +0100 |
|---|---|---|
| committer | Dave Airlie | 2017-03-23 03:05:13 +0100 |
| commit | 65d1086c44791112188f6aebbdc3a27cab3736d3 (patch) | |
| tree | f769c133e61c54e34e91aa9ecf1d3504a6eb4fb4 /drivers/acpi/ioapic.c | |
| parent | Merge tag 'drm-misc-next-2017-03-21' of git://anongit.freedesktop.org/git/drm... (diff) | |
| parent | Linux 4.11-rc3 (diff) | |
| download | kernel-qcow2-linux-65d1086c44791112188f6aebbdc3a27cab3736d3.tar.gz kernel-qcow2-linux-65d1086c44791112188f6aebbdc3a27cab3736d3.tar.xz kernel-qcow2-linux-65d1086c44791112188f6aebbdc3a27cab3736d3.zip | |
BackMerge tag 'v4.11-rc3' into drm-next
Linux 4.11-rc3 as requested by Daniel
Diffstat (limited to 'drivers/acpi/ioapic.c')
| -rw-r--r-- | drivers/acpi/ioapic.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/drivers/acpi/ioapic.c b/drivers/acpi/ioapic.c index 6d7ce6e12aaa..1120dfd625b8 100644 --- a/drivers/acpi/ioapic.c +++ b/drivers/acpi/ioapic.c @@ -206,24 +206,34 @@ int acpi_ioapic_add(acpi_handle root_handle) return ACPI_SUCCESS(status) && ACPI_SUCCESS(retval) ? 0 : -ENODEV; } -int acpi_ioapic_remove(struct acpi_pci_root *root) +void pci_ioapic_remove(struct acpi_pci_root *root) { - int retval = 0; struct acpi_pci_ioapic *ioapic, *tmp; mutex_lock(&ioapic_list_lock); list_for_each_entry_safe(ioapic, tmp, &ioapic_list, list) { if (root->device->handle != ioapic->root_handle) continue; - - if (acpi_unregister_ioapic(ioapic->handle, ioapic->gsi_base)) - retval = -EBUSY; - if (ioapic->pdev) { pci_release_region(ioapic->pdev, 0); pci_disable_device(ioapic->pdev); pci_dev_put(ioapic->pdev); } + } + mutex_unlock(&ioapic_list_lock); +} + +int acpi_ioapic_remove(struct acpi_pci_root *root) +{ + int retval = 0; + struct acpi_pci_ioapic *ioapic, *tmp; + + mutex_lock(&ioapic_list_lock); + list_for_each_entry_safe(ioapic, tmp, &ioapic_list, list) { + if (root->device->handle != ioapic->root_handle) + continue; + if (acpi_unregister_ioapic(ioapic->handle, ioapic->gsi_base)) + retval = -EBUSY; if (ioapic->res.flags && ioapic->res.parent) release_resource(&ioapic->res); list_del(&ioapic->list); |