diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-16 18:41:29 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-21 02:47:52 +0200 |
| commit | c066b65abfe20b7a23ad3b1161cd67315f65f3c1 (patch) | |
| tree | 79df0fee06603e497dafe1bc950c5c5e03c881da | |
| parent | switch assorted clock drivers to debugfs_remove_recursive() (diff) | |
| download | linux-c066b65abfe20b7a23ad3b1161cd67315f65f3c1.tar.xz linux-c066b65abfe20b7a23ad3b1161cd67315f65f3c1.zip | |
arm: don't create useless copies to pass into debugfs_create_dir()
its first argument is const char * and it's really not modified...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-ux500/clock.c | 11 | ||||
| -rw-r--r-- | arch/arm/plat-omap/clock.c | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c index 1d8509d59c09..7d107be63eb4 100644 --- a/arch/arm/mach-ux500/clock.c +++ b/arch/arm/mach-ux500/clock.c @@ -636,15 +636,12 @@ static struct dentry *clk_debugfs_register_dir(struct clk *c, struct dentry *p_dentry) { struct dentry *d, *clk_d; - char s[255]; - char *p = s; + 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; diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 43bae2c1e34d..964704f40bbe 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c @@ -482,11 +482,8 @@ static int clk_debugfs_register_one(struct clk *c) int err; 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; @@ -509,7 +506,6 @@ static int clk_debugfs_register_one(struct clk *c) return 0; err_out: - d = c->dent; debugfs_remove_recursive(c->dent); return err; } |