Merge branches 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/omap', 'generic-dma-ops' and...

[linux-block.git] / drivers / iommu / omap-iommu-debug.c

diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c
index ff31bddba60accc8790aaeafede15b1f14e78f48..8e19bfa94121e701c7987136bbcb2a0953c52ed9 100644 (file)
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c
@@ -236,17 +236,6 @@ DEBUG_FOPS_RO(regs);
 DEFINE_SHOW_ATTRIBUTE(tlb);
 DEFINE_SHOW_ATTRIBUTE(pagetable);
 
-#define __DEBUG_ADD_FILE(attr, mode)                                   \
-       {                                                               \
-               struct dentry *dent;                                    \
-               dent = debugfs_create_file(#attr, mode, obj->debug_dir, \
-                                          obj, &attr##_fops);          \
-               if (!dent)                                              \
-                       goto err;                                       \
-       }
-
-#define DEBUG_ADD_FILE_RO(name) __DEBUG_ADD_FILE(name, 0400)
-
 void omap_iommu_debugfs_add(struct omap_iommu *obj)
 {
        struct dentry *d;
@@ -254,23 +243,13 @@ void omap_iommu_debugfs_add(struct omap_iommu *obj)
        if (!iommu_debug_root)
                return;
 
-       obj->debug_dir = debugfs_create_dir(obj->name, iommu_debug_root);
-       if (!obj->debug_dir)
-               return;
+       d = debugfs_create_dir(obj->name, iommu_debug_root);
+       obj->debug_dir = d;
 
-       d = debugfs_create_u32("nr_tlb_entries", 0400, obj->debug_dir,
-                              &obj->nr_tlb_entries);
-       if (!d)
-               return;
-
-       DEBUG_ADD_FILE_RO(regs);
-       DEBUG_ADD_FILE_RO(tlb);
-       DEBUG_ADD_FILE_RO(pagetable);
-
-       return;
-
-err:
-       debugfs_remove_recursive(obj->debug_dir);
+       debugfs_create_u32("nr_tlb_entries", 0400, d, &obj->nr_tlb_entries);
+       debugfs_create_file("regs", 0400, d, obj, &regs_fops);
+       debugfs_create_file("tlb", 0400, d, obj, &tlb_fops);
+       debugfs_create_file("pagetable", 0400, d, obj, &pagetable_fops);
 }
 
 void omap_iommu_debugfs_remove(struct omap_iommu *obj)
@@ -284,8 +263,6 @@ void omap_iommu_debugfs_remove(struct omap_iommu *obj)
 void __init omap_iommu_debugfs_init(void)
 {
        iommu_debug_root = debugfs_create_dir("omap_iommu", NULL);
-       if (!iommu_debug_root)
-               pr_err("can't create debugfs dir\n");
 }
 
 void __exit omap_iommu_debugfs_exit(void)