git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
plat-spear
/
clock.c
diff --git
a/arch/arm/plat-spear/clock.c
b/arch/arm/plat-spear/clock.c
index
6fa474c
..
67dd003
100644
(file)
--- a/
arch/arm/plat-spear/clock.c
+++ b/
arch/arm/plat-spear/clock.c
@@
-916,7
+916,7
@@
static struct dentry *clk_debugfs_root;
static int clk_debugfs_register_one(struct clk *c)
{
int err;
static int clk_debugfs_register_one(struct clk *c)
{
int err;
- struct dentry *d
, *child
;
+ struct dentry *d;
struct clk *pa = c->pclk;
char s[255];
char *p = s;
struct clk *pa = c->pclk;
char s[255];
char *p = s;
@@
-951,10
+951,7
@@
static int clk_debugfs_register_one(struct clk *c)
return 0;
err_out:
return 0;
err_out:
- d = c->dent;
- list_for_each_entry(child, &d->d_subdirs, d_u.d_child)
- debugfs_remove(child);
- debugfs_remove(c->dent);
+ debugfs_remove_recursive(c->dent);
return err;
}
return err;
}