Skip to contentSkip to conversation

omap-iommu: no need to check return value of debugfs_create functions

PATCH In review Greg Kroah-Hartman 2 participants 3 messages Jul 4, 2019 – Jul 5, 2019 IOMMU

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 omap-iommu: no need to check return value of debugfs_create functions

When calling debugfs functions, there is no need to ever check the return value. The function can work or not, but the code logic should never do something different based on this.

---
Warning, not even test-built, but "should" work :)

 drivers/iommu/omap-iommu-debug.c | 35 ++++++--------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)
drivers/iommu/omap-iommu-debug.c +6 -29
index 4abc0ef522a8..cea851702f54 100644
@@ -239,17 +239,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;
@@ -257,23 +246,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, &attrregs_fops);
+	debugfs_create_file("tlb", 0400, d, obj, &attrtlb_fops);
+	debugfs_create_file("pagetable", 0400, d, obj, &attrpagetable_fops);
 }
 
 void omap_iommu_debugfs_remove(struct omap_iommu *obj)
@@ -287,8 +266,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)
Signature · 1 line
2.22.0
maintainer
#1 lore raw
Quoted 9 lines · Greg Kroah-Hartman

When calling debugfs functions, there is no need to ever check the return value. The function can work or not, but the code logic should never do something different based on this.

---
Warning, not even test-built, but "should" work :)

It almost did :)

drivers/iommu/omap-iommu-debug.c void omap_iommu_debugfs_add(struct omap_iommu *obj) · line 255

Quoted 3 lines
drivers/iommu/omap-iommu-debug.c +3 -0
+	debugfs_create_file("regs", 0400, d, obj, &attrregs_fops);
+	debugfs_create_file("tlb", 0400, d, obj, &attrtlb_fops);
+	debugfs_create_file("pagetable", 0400, d, obj, &attrpagetable_fops);

The _fops were named without the 'attr' prefix, changed that and it compiled. Patch is now applied.

Thanks,

Joerg

#2 lore raw
Quoted 11 lines · Joerg Roedel
Quoted 9 lines · Greg Kroah-Hartman

When calling debugfs functions, there is no need to ever check the return value. The function can work or not, but the code logic should never do something different based on this.

---
Warning, not even test-built, but "should" work :)

Quoted 8 lines

It almost did :)

drivers/iommu/omap-iommu-debug.c void omap_iommu_debugfs_add(struct omap_iommu *obj) · line 255

Quoted 3 lines
drivers/iommu/omap-iommu-debug.c +3 -0
+	debugfs_create_file("regs", 0400, d, obj, &attrregs_fops);
+	debugfs_create_file("tlb", 0400, d, obj, &attrtlb_fops);
+	debugfs_create_file("pagetable", 0400, d, obj, &attrpagetable_fops);

The _fops were named without the 'attr' prefix, changed that and it compiled. Patch is now applied.

Ah, so close :)

Thanks for fixing it up and applying it!

greg k-h
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu