Merge tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / mach-omap1 / clock.c

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 406fd2a9a88f4012ca3fbbd39ec0d52d3af79ff2..bd5be82101f321b2879c91b15e3628cf5d29ee7c 100644 (file)
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -987,84 +987,44 @@ 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);