lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu: Remove iommu_debugfs_top

Browse Source 
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: Isaac J. Manjarres <isaacm@codeaurora.org>
This commit is contained in:
Isaac J. Manjarres 2020-06-25 09:38:06 -07:00
parent f759692d36
commit af3b847f20
5 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iommu/io-pgtable.c
View File

@ -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;

3
drivers/iommu/iommu-debug.c
View File

@ -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;

1
drivers/iommu/iommu-debugfs.c
View File

@ -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");

3
drivers/iommu/iommu.c
View File

@ -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",

1
include/linux/iommu.h
View File

@ -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 */