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

[pandora-kernel.git] / arch / arm / plat-samsung / clock.c

diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c
index aecf9e9..302c426 100644 (file)
--- a/arch/arm/plat-samsung/clock.c
+++ b/arch/arm/plat-samsung/clock.c
@@ -375,7 +375,7 @@ static struct dentry *clk_debugfs_root;
 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;
@@ -402,10 +402,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;
 }