Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af3b847f authored by Isaac J. Manjarres's avatar Isaac J. Manjarres
Browse files

iommu: Remove iommu_debugfs_top 



iommu_debugfs_top was introduced in earlier kernel versions when
IOMMU_DEBUGFS was not present. Now that IOMMU_DEBUGFS is present,
and exposes iommu_debugfs_dir, which is logically equivalent to
iommu_debugfs_top, there is no point in keeping it around, so
remove it.

Change-Id: I7032e370ccfd32f9d2b9046fecd98b4c6388450f
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parent f759692d

drivers/iommu/io-pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/iommu/iommu-debug.c

+1 −2
Original line number Diff line number Diff line
@@ -2347,8 +2347,7 @@ static int iommu_debug_device_setup(struct device *dev) 


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;

drivers/iommu/iommu-debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -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");

drivers/iommu/iommu.c

+0 −3
Original line number Diff line number Diff line
@@ -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",

include/linux/iommu.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */