diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
index f3b31328e166..1010d388c9eb 100644
--- a/drivers/iommu/io-pgtable.c
+++ b/drivers/iommu/io-pgtable.c
@@ -84,7 +84,7 @@ static atomic_t pages_allocated;
 
 static int io_pgtable_init(void)
 {
-	io_pgtable_top = debugfs_create_dir("io-pgtable", iommu_debugfs_top);
+	io_pgtable_top = debugfs_create_dir("io-pgtable", iommu_debugfs_dir);
 	if (!io_pgtable_top)
 		return -ENODEV;
 
diff --git a/drivers/iommu/iommu-debug.c b/drivers/iommu/iommu-debug.c
index dd1932f530d5..0abd5089f44b 100644
--- a/drivers/iommu/iommu-debug.c
+++ b/drivers/iommu/iommu-debug.c
@@ -2347,8 +2347,7 @@ err:
 
 static int iommu_debug_init_tests(void)
 {
-	debugfs_tests_dir = debugfs_create_dir("tests",
-					       iommu_debugfs_top);
+	debugfs_tests_dir = debugfs_create_dir("tests", iommu_debugfs_dir);
 	if (!debugfs_tests_dir) {
 		pr_err_ratelimited("Couldn't create iommu/tests debugfs directory\n");
 		return -ENODEV;
diff --git a/drivers/iommu/iommu-debugfs.c b/drivers/iommu/iommu-debugfs.c
index 41ced5ab3bed..f03548942096 100644
--- a/drivers/iommu/iommu-debugfs.c
+++ b/drivers/iommu/iommu-debugfs.c
@@ -32,7 +32,6 @@ void iommu_debugfs_setup(void)
 {
 	if (!iommu_debugfs_dir) {
 		iommu_debugfs_dir = debugfs_create_dir("iommu", NULL);
-		iommu_debugfs_top = iommu_debugfs_dir;
 		pr_warn("\n");
 		pr_warn("*************************************************************\n");
 		pr_warn("**     NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE    **\n");
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 446b84be2f0a..76e14dc52edc 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -20,7 +20,6 @@
 #include <linux/err.h>
 #include <linux/pci.h>
 #include <linux/bitops.h>
-#include <linux/debugfs.h>
 #include <linux/property.h>
 #include <linux/fsl/mc.h>
 #include <linux/module.h>
@@ -2162,8 +2161,6 @@ int report_iommu_fault(struct iommu_domain *domain, struct device *dev,
 }
 EXPORT_SYMBOL_GPL(report_iommu_fault);
 
-struct dentry *iommu_debugfs_top;
-
 static int __init iommu_init(void)
 {
 	iommu_group_kset = kset_create_and_add("iommu_groups",
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index adbf54c068f2..6038be82e671 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -227,7 +227,6 @@ struct iommu_resv_region {
 	enum iommu_resv_type	type;
 };
 
-extern struct dentry *iommu_debugfs_top;
 /* Per device IOMMU features */
 enum iommu_dev_features {
 	IOMMU_DEV_FEAT_AUX,	/* Aux-domain feature */