Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / arm / mach-ux500 / clock.c

diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c
index 32ce908..7d107be 100644 (file)
--- a/arch/arm/mach-ux500/clock.c
+++ b/arch/arm/mach-ux500/clock.c
@@ -635,16 +635,13 @@ static const struct file_operations set_rate_fops = {
 static struct dentry *clk_debugfs_register_dir(struct clk *c,
                                                struct dentry *p_dentry)
 {
-       struct dentry *d, *clk_d, *child, *child_tmp;
-       char s[255];
-       char *p = s;
+       struct dentry *d, *clk_d;
+       const char *p = c->name;
 
-       if (c->name == NULL)
-               p += sprintf(p, "BUG");
-       else
-               p += sprintf(p, "%s", c->name);
+       if (!p)
+               p = "BUG";
 
-       clk_d = debugfs_create_dir(s, p_dentry);
+       clk_d = debugfs_create_dir(p, p_dentry);
        if (!clk_d)
                return NULL;
 
@@ -666,24 +663,10 @@ static struct dentry *clk_debugfs_register_dir(struct clk *c,
        return clk_d;
 
 err_out:
-       d = clk_d;
-       list_for_each_entry_safe(child, child_tmp, &d->d_subdirs, d_u.d_child)
-               debugfs_remove(child);
-       debugfs_remove(clk_d);
+       debugfs_remove_recursive(clk_d);
        return NULL;
 }
 
-static void clk_debugfs_remove_dir(struct dentry *cdentry)
-{
-       struct dentry *d, *child, *child_tmp;
-
-       d = cdentry;
-       list_for_each_entry_safe(child, child_tmp, &d->d_subdirs, d_u.d_child)
-               debugfs_remove(child);
-       debugfs_remove(cdentry);
-       return ;
-}
-
 static int clk_debugfs_register_one(struct clk *c)
 {
        struct clk *pa = c->parent_periph;
@@ -700,7 +683,7 @@ static int clk_debugfs_register_one(struct clk *c)
                c->dent_bus = clk_debugfs_register_dir(c,
                                bpa->dent_bus ? bpa->dent_bus : bpa->dent);
                if ((!c->dent_bus) &&  (c->dent)) {
-                       clk_debugfs_remove_dir(c->dent);
+                       debugfs_remove_recursive(c->dent);
                        c->dent = NULL;
                        return -ENOMEM;
                }