sh: remove name and id from struct clk
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:
parent
1ffbb037d8
commit
69395396a0
|
@ -180,7 +180,6 @@ static int __init sh_clk_div6_register_ops(struct clk *clks, int nr,
|
|||
clkp = clks + k;
|
||||
|
||||
clkp->ops = ops;
|
||||
clkp->id = -1;
|
||||
clkp->freq_table = freq_table + (k * freq_table_size);
|
||||
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->ops = ops;
|
||||
clkp->id = -1;
|
||||
clkp->priv = table;
|
||||
|
||||
clkp->freq_table = freq_table + (k * freq_table_size);
|
||||
|
|
|
@ -161,8 +161,8 @@ void propagate_rate(struct clk *tclk)
|
|||
|
||||
static void __clk_disable(struct clk *clk)
|
||||
{
|
||||
if (WARN(!clk->usecount, "Trying to disable clock %s with 0 usecount\n",
|
||||
clk->name))
|
||||
if (WARN(!clk->usecount, "Trying to disable clock %p with 0 usecount\n",
|
||||
clk))
|
||||
return;
|
||||
|
||||
if (!(--clk->usecount)) {
|
||||
|
@ -357,8 +357,8 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
|
|||
if (ret == 0) {
|
||||
if (clk->ops->recalc)
|
||||
clk->rate = clk->ops->recalc(clk);
|
||||
pr_debug("clock: set parent of %s to %s (new rate %ld)\n",
|
||||
clk->name, clk->parent->name, clk->rate);
|
||||
pr_debug("clock: set parent of %p to %p (new rate %ld)\n",
|
||||
clk, clk->parent, clk->rate);
|
||||
propagate_rate(clk);
|
||||
}
|
||||
} else
|
||||
|
@ -470,9 +470,7 @@ static int clk_debugfs_register_one(struct clk *c)
|
|||
char s[255];
|
||||
char *p = s;
|
||||
|
||||
p += sprintf(p, "%s", c->name);
|
||||
if (c->id >= 0)
|
||||
sprintf(p, ":%d", c->id);
|
||||
p += sprintf(p, "%p", c);
|
||||
d = debugfs_create_dir(s, pa ? pa->dentry : clk_debugfs_root);
|
||||
if (!d)
|
||||
return -ENOMEM;
|
||||
|
@ -514,7 +512,7 @@ static int clk_debugfs_register(struct clk *c)
|
|||
return err;
|
||||
}
|
||||
|
||||
if (!c->dentry && c->name) {
|
||||
if (!c->dentry) {
|
||||
err = clk_debugfs_register_one(c);
|
||||
if (err)
|
||||
return err;
|
||||
|
|
|
@ -21,9 +21,6 @@ struct clk_ops {
|
|||
|
||||
struct clk {
|
||||
struct list_head node;
|
||||
const char *name;
|
||||
int id;
|
||||
|
||||
struct clk *parent;
|
||||
struct clk **parent_table; /* list of parents to */
|
||||
unsigned short parent_num; /* choose between */
|
||||
|
|
Loading…
Reference in a new issue