]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
sh: allow registering clocks without name
authorMagnus Damm <damm@opensource.se>
Mon, 10 May 2010 14:01:34 +0000 (14:01 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 11 May 2010 02:48:43 +0000 (11:48 +0900)
Modify the SuperH clock code to support struct clk
with NULL as name. Such clocks will not be hooked
up to debugfs.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/kernel/cpu/clock.c

index 9ded1bc29260fc029cd3f9f119704f65177c00ee..073f4ffe956a9000145bb5d83bc750554d4d065a 100644 (file)
@@ -415,7 +415,7 @@ struct clk *clk_get(struct device *dev, const char *id)
 
        mutex_lock(&clock_list_sem);
        list_for_each_entry(p, &clock_list, node) {
-               if (p->id == idno &&
+               if (p->name && p->id == idno &&
                    strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
                        clk = p;
                        goto found;
@@ -423,7 +423,8 @@ struct clk *clk_get(struct device *dev, const char *id)
        }
 
        list_for_each_entry(p, &clock_list, node) {
-               if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
+               if (p->name &&
+                   strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
                        clk = p;
                        break;
                }
@@ -594,7 +595,7 @@ static int clk_debugfs_register(struct clk *c)
                        return err;
        }
 
-       if (!c->dentry) {
+       if (!c->dentry && c->name) {
                err = clk_debugfs_register_one(c);
                if (err)
                        return err;