summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2019-02-20 08:05:05 -0500
committerJoerg Roedel <jroedel@suse.de>2019-02-26 05:15:58 -0500
commit18b3af4492a0aa6046b86d712f6ba4cbb66100fb (patch)
tree5a3b161a9bd69b7348858e1dfa6b1f1e45513ece
parenta7055d572c51338bed8673331ead6759cae6b70b (diff)
iommu: Fix IOMMU debugfs fallout
A change made in the final version of IOMMU debugfs support replaced the public function iommu_debugfs_new_driver_dir() by the public dentry iommu_debugfs_dir in <linux/iommu.h>, but forgot to update both the implementation in iommu-debugfs.c, and the patch description. Fix this by exporting iommu_debugfs_dir, and removing the reference to and implementation of iommu_debugfs_new_driver_dir(). Fixes: bad614b24293ae46 ("iommu: Enable debugfs exposure of IOMMU driver internals") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Gary R Hook <gary.hook@amd.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r--drivers/iommu/iommu-debugfs.c23
1 files changed, 4 insertions, 19 deletions
diff --git a/drivers/iommu/iommu-debugfs.c b/drivers/iommu/iommu-debugfs.c
index 3b1bf88fd1b0..f03548942096 100644
--- a/drivers/iommu/iommu-debugfs.c
+++ b/drivers/iommu/iommu-debugfs.c
@@ -12,6 +12,7 @@
12#include <linux/debugfs.h> 12#include <linux/debugfs.h>
13 13
14struct dentry *iommu_debugfs_dir; 14struct dentry *iommu_debugfs_dir;
15EXPORT_SYMBOL_GPL(iommu_debugfs_dir);
15 16
16/** 17/**
17 * iommu_debugfs_setup - create the top-level iommu directory in debugfs 18 * iommu_debugfs_setup - create the top-level iommu directory in debugfs
@@ -23,9 +24,9 @@ struct dentry *iommu_debugfs_dir;
23 * Emit a strong warning at boot time to indicate that this feature is 24 * Emit a strong warning at boot time to indicate that this feature is
24 * enabled. 25 * enabled.
25 * 26 *
26 * This function is called from iommu_init; drivers may then call 27 * This function is called from iommu_init; drivers may then use
27 * iommu_debugfs_new_driver_dir() to instantiate a vendor-specific 28 * iommu_debugfs_dir to instantiate a vendor-specific directory to be used
28 * directory to be used to expose internal data. 29 * to expose internal data.
29 */ 30 */
30void iommu_debugfs_setup(void) 31void iommu_debugfs_setup(void)
31{ 32{
@@ -48,19 +49,3 @@ void iommu_debugfs_setup(void)
48 pr_warn("*************************************************************\n"); 49 pr_warn("*************************************************************\n");
49 } 50 }
50} 51}
51
52/**
53 * iommu_debugfs_new_driver_dir - create a vendor directory under debugfs/iommu
54 * @vendor: name of the vendor-specific subdirectory to create
55 *
56 * This function is called by an IOMMU driver to create the top-level debugfs
57 * directory for that driver.
58 *
59 * Return: upon success, a pointer to the dentry for the new directory.
60 * NULL in case of failure.
61 */
62struct dentry *iommu_debugfs_new_driver_dir(const char *vendor)
63{
64 return debugfs_create_dir(vendor, iommu_debugfs_dir);
65}
66EXPORT_SYMBOL_GPL(iommu_debugfs_new_driver_dir);