[PATCH V4 16/23] x86, acpi, pci: Use equivalent function from mcfg.c driver.
From: Tomasz Nowicki <hidden>
Date: 2016-02-04 17:32:52
Also in:
linux-acpi, linux-pci, lkml
Subsystem:
acpi, pci subsystem, the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
"Rafael J. Wysocki", Bjorn Helgaas, Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
Since mcfg.c driver provides the same function lets use it and remove code duplication. Signed-off-by: Tomasz Nowicki <redacted> Tested-by: Duc Dang <redacted> Tested-by: Dongdong Liu <redacted> Tested-by: Hanjun Guo <redacted> Tested-by: Graeme Gregory <redacted> Tested-by: Sinan Kaya <redacted> --- arch/x86/pci/acpi.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index d5086d1..b4e72b5 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c@@ -201,29 +201,11 @@ static int setup_mcfg_map(struct acpi_pci_root_info *ci) return 0; } - -static void teardown_mcfg_map(struct acpi_pci_root_info *ci) -{ - struct acpi_pci_root *root = ci->root; - struct pci_mmcfg_region *cfg; - - cfg = pci_mmconfig_lookup(root->segment, root->secondary.start); - if (!cfg) - return; - - if (cfg->hot_added) - pci_mmconfig_delete(root->segment, root->secondary.start, - root->secondary.end); -} #else static int setup_mcfg_map(struct acpi_pci_root_info *ci) { return 0; } - -static void teardown_mcfg_map(struct acpi_pci_root_info *ci) -{ -} #endif static int pci_acpi_root_get_node(struct acpi_pci_root *root)
@@ -251,7 +233,7 @@ static int pci_acpi_root_init_info(struct acpi_pci_root_info *ci) static void pci_acpi_root_release_info(struct acpi_pci_root_info *ci) { - teardown_mcfg_map(ci); + pci_mmcfg_teardown_map(ci); kfree(container_of(ci, struct pci_root_info, common)); }
--
1.9.1