OSDN Git Service

arm: omap1: no need to check return value of debugfs_create functions
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 Jan 2019 14:41:13 +0000 (15:41 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Jun 2019 13:49:07 +0000 (15:49 +0200)
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.

Cc: Paul Walmsley <paul@pwsan.com>
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Kevin Hilman <khilman@kernel.org>
Cc: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/mach-omap1/clock.c
arch/arm/mach-omap1/pm.c

index c8c6fe8..3d7ab2b 100644 (file)
@@ -990,84 +990,45 @@ static int debug_clock_show(struct seq_file *s, void *unused)
 
 DEFINE_SHOW_ATTRIBUTE(debug_clock);
 
-static int clk_debugfs_register_one(struct clk *c)
+static void clk_debugfs_register_one(struct clk *c)
 {
-       int err;
        struct dentry *d;
        struct clk *pa = c->parent;
 
        d = debugfs_create_dir(c->name, pa ? pa->dent : clk_debugfs_root);
-       if (!d)
-               return -ENOMEM;
        c->dent = d;
 
-       d = debugfs_create_u8("usecount", S_IRUGO, c->dent, &c->usecount);
-       if (!d) {
-               err = -ENOMEM;
-               goto err_out;
-       }
-       d = debugfs_create_ulong("rate", S_IRUGO, c->dent, &c->rate);
-       if (!d) {
-               err = -ENOMEM;
-               goto err_out;
-       }
-       d = debugfs_create_x8("flags", S_IRUGO, c->dent, &c->flags);
-       if (!d) {
-               err = -ENOMEM;
-               goto err_out;
-       }
-       return 0;
-
-err_out:
-       debugfs_remove_recursive(c->dent);
-       return err;
+       debugfs_create_u8("usecount", S_IRUGO, c->dent, &c->usecount);
+       debugfs_create_ulong("rate", S_IRUGO, c->dent, &c->rate);
+       debugfs_create_x8("flags", S_IRUGO, c->dent, &c->flags);
 }
 
-static int clk_debugfs_register(struct clk *c)
+static void clk_debugfs_register(struct clk *c)
 {
        int err;
        struct clk *pa = c->parent;
 
-       if (pa && !pa->dent) {
-               err = clk_debugfs_register(pa);
-               if (err)
-                       return err;
-       }
+       if (pa && !pa->dent)
+               clk_debugfs_register(pa);
 
-       if (!c->dent) {
-               err = clk_debugfs_register_one(c);
-               if (err)
-                       return err;
-       }
-       return 0;
+       if (!c->dent)
+               clk_debugfs_register_one(c);
 }
 
 static int __init clk_debugfs_init(void)
 {
        struct clk *c;
        struct dentry *d;
-       int err;
 
        d = debugfs_create_dir("clock", NULL);
-       if (!d)
-               return -ENOMEM;
        clk_debugfs_root = d;
 
-       list_for_each_entry(c, &clocks, node) {
-               err = clk_debugfs_register(c);
-               if (err)
-                       goto err_out;
-       }
+       list_for_each_entry(c, &clocks, node)
+               clk_debugfs_register(c);
 
-       d = debugfs_create_file("summary", S_IRUGO,
-               d, NULL, &debug_clock_fops);
-       if (!d)
-               return -ENOMEM;
+       debugfs_create_file("summary", S_IRUGO, d, NULL, &debug_clock_fops);
 
        return 0;
-err_out:
-       debugfs_remove_recursive(clk_debugfs_root);
-       return err;
 }
 late_initcall(clk_debugfs_init);
 
index 998075d..d068958 100644 (file)
@@ -539,11 +539,8 @@ static void omap_pm_init_debugfs(void)
        struct dentry *d;
 
        d = debugfs_create_dir("pm_debug", NULL);
-       if (!d)
-               return;
-
-       (void) debugfs_create_file("omap_pm", S_IWUSR | S_IRUGO,
-                                       d, NULL, &omap_pm_debug_fops);
+       debugfs_create_file("omap_pm", S_IWUSR | S_IRUGO, d, NULL,
+                           &omap_pm_debug_fops);
 }
 
 #endif /* CONFIG_DEBUG_FS */