summaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2017-06-16 16:09:55 +0200
committerJoerg Roedel <jroedel@suse.de>2017-06-22 12:54:20 +0200
commit90b3eb03e1b2b2ece299c485ae9da0cd221e700d (patch)
treef7f59d04884541efa446d7425187d0e53fdedcb5 /drivers/iommu
parentiommu/amd: Disable IOMMUs at boot if they are enabled (diff)
downloadlinux-90b3eb03e1b2b2ece299c485ae9da0cd221e700d.tar.xz
linux-90b3eb03e1b2b2ece299c485ae9da0cd221e700d.zip
iommu/amd: Rename free_on_init_error()
The function will also be used to free iommu resources when amd_iommu=off was specified on the kernel command line. So rename the function to reflect that. Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/amd_iommu_init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index f123fa5a7adb..74f4eea6be77 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -2108,7 +2108,7 @@ static struct syscore_ops amd_iommu_syscore_ops = {
.resume = amd_iommu_resume,
};
-static void __init free_on_init_error(void)
+static void __init free_iommu_resources(void)
{
kmemleak_free(irq_lookup_table);
free_pages((unsigned long)irq_lookup_table,
@@ -2536,7 +2536,7 @@ static int __init amd_iommu_init(void)
free_dma_resources();
if (!irq_remapping_enabled) {
disable_iommus();
- free_on_init_error();
+ free_iommu_resources();
} else {
struct amd_iommu *iommu;