Merge branch 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux...

[karo-tx-linux.git] / arch / arm / plat-omap / clock.c

diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 156b27dd58172fe4762801c68699977a8f961c25..3ba4d11ca73e25b53be83ccb883319d3f0560af7 100644 (file)
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -513,13 +513,10 @@ static const struct file_operations debug_clock_fops = {
 static int clk_debugfs_register_one(struct clk *c)
 {
        int err;
-       struct dentry *d, *child, *child_tmp;
+       struct dentry *d;
        struct clk *pa = c->parent;
-       char s[255];
-       char *p = s;
 
-       p += sprintf(p, "%s", c->name);
-       d = debugfs_create_dir(s, pa ? pa->dent : clk_debugfs_root);
+       d = debugfs_create_dir(c->name, pa ? pa->dent : clk_debugfs_root);
        if (!d)
                return -ENOMEM;
        c->dent = d;
@@ -542,10 +539,7 @@ static int clk_debugfs_register_one(struct clk *c)
        return 0;
 
 err_out:
-       d = c->dent;
-       list_for_each_entry_safe(child, child_tmp, &d->d_subdirs, d_u.d_child)
-               debugfs_remove(child);
-       debugfs_remove(c->dent);
+       debugfs_remove_recursive(c->dent);
        return err;
 }