Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sh: remove name and id from struct clk

Browse source 
Remove "name" and "id" from drivers/sh/ struct clk.

The struct clk members "name" and "id" are not used
now when matching is done through clkdev.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Magnus Damm 2010-10-13 07:44:36 +00:00 • committed by Paul Mundt
parent 1ffbb037d8
commit 69395396a0
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/sh/clk-cpg.c
View file

@ -180,7 +180,6 @@ static int __init sh_clk_div6_register_ops(struct clk *clks, int nr,
clkp = clks + k; clkp = clks + k;
clkp->ops = ops; clkp->ops = ops;
clkp->id = -1;
clkp->freq_table = freq_table + (k * freq_table_size); clkp->freq_table = freq_table + (k * freq_table_size);
clkp->freq_table[nr_divs].frequency = CPUFREQ_TABLE_END; clkp->freq_table[nr_divs].frequency = CPUFREQ_TABLE_END;
@ -319,7 +318,6 @@ static int __init sh_clk_div4_register_ops(struct clk *clks, int nr,
clkp = clks + k; clkp = clks + k;
clkp->ops = ops; clkp->ops = ops;
clkp->id = -1;
clkp->priv = table; clkp->priv = table;
clkp->freq_table = freq_table + (k * freq_table_size); clkp->freq_table = freq_table + (k * freq_table_size);

14
drivers/sh/clk.c
View file

@ -161,8 +161,8 @@ void propagate_rate(struct clk *tclk)
static void __clk_disable(struct clk *clk) static void __clk_disable(struct clk *clk)
{ {
if (WARN(!clk->usecount, "Trying to disable clock %s with 0 usecount\n", if (WARN(!clk->usecount, "Trying to disable clock %p with 0 usecount\n",
clk->name)) clk))
return; return;
if (!(--clk->usecount)) { if (!(--clk->usecount)) {
@ -357,8 +357,8 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
if (ret == 0) { if (ret == 0) {
if (clk->ops->recalc) if (clk->ops->recalc)
clk->rate = clk->ops->recalc(clk); clk->rate = clk->ops->recalc(clk);
pr_debug("clock: set parent of %s to %s (new rate %ld)\n", pr_debug("clock: set parent of %p to %p (new rate %ld)\n",
clk->name, clk->parent->name, clk->rate); clk, clk->parent, clk->rate);
propagate_rate(clk); propagate_rate(clk);
} }
} else } else
@ -470,9 +470,7 @@ static int clk_debugfs_register_one(struct clk *c)
char s[255]; char s[255];
char *p = s; char *p = s;
p += sprintf(p, "%s", c->name); p += sprintf(p, "%p", c);
if (c->id >= 0)
sprintf(p, ":%d", c->id);
d = debugfs_create_dir(s, pa ? pa->dentry : clk_debugfs_root); d = debugfs_create_dir(s, pa ? pa->dentry : clk_debugfs_root);
if (!d) if (!d)
return -ENOMEM; return -ENOMEM;
@ -514,7 +512,7 @@ static int clk_debugfs_register(struct clk *c)
return err; return err;
} }
if (!c->dentry && c->name) { if (!c->dentry) {
err = clk_debugfs_register_one(c); err = clk_debugfs_register_one(c);
if (err) if (err)
return err; return err;

3
include/linux/sh_clk.h
View file

@ -21,9 +21,6 @@ struct clk_ops {
struct clk { struct clk {
struct list_head node; struct list_head node;
const char *name;
int id;
struct clk *parent; struct clk *parent;
struct clk **parent_table; /* list of parents to */ struct clk **parent_table; /* list of parents to */
unsigned short parent_num; /* choose between */ unsigned short parent_num; /* choose between */