lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: clkfwk: Kill off now unused algo_id in set_rate op.

Browse Source 
Now that clk_set_rate_ex() is gone, there is also no way to get at rate
setting algo id, which is now also completely unused. Kill it off before
new clock ops start using it.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2010-11-15 18:18:32 +09:00
parent 9a1683d1dd
commit 35a96c739f
5 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-shmobile/clock-sh7372.c
View File

@@ -220,8 +220,7 @@ static void pllc2_disable(struct clk *clk)
__raw_writel(__raw_readl(PLLC2CR) & ~0x80000000, PLLC2CR); __raw_writel(__raw_readl(PLLC2CR) & ~0x80000000, PLLC2CR);
} }
static int pllc2_set_rate(struct clk *clk, static int pllc2_set_rate(struct clk *clk, unsigned long rate)
unsigned long rate, int algo_id)
{ {
unsigned long value; unsigned long value;
int idx; int idx;
@@ -463,8 +462,7 @@ static int fsidiv_enable(struct clk *clk)
return 0; return 0;
} }
static int fsidiv_set_rate(struct clk *clk, static int fsidiv_set_rate(struct clk *clk, unsigned long rate)
unsigned long rate, int algo_id)
{ {
int idx; int idx;

2
arch/sh/kernel/cpu/sh4/clock-sh4-202.c
View File

@@ -110,7 +110,7 @@ static int shoc_clk_verify_rate(struct clk *clk, unsigned long rate)
return 0; return 0;
} }
static int shoc_clk_set_rate(struct clk *clk, unsigned long rate, int algo_id) static int shoc_clk_set_rate(struct clk *clk, unsigned long rate)
{ {
unsigned long frqcr3; unsigned long frqcr3;
unsigned int tmp; unsigned int tmp;

5
drivers/sh/clk/core.c
View File

@@ -461,7 +461,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
spin_lock_irqsave(&clock_lock, flags); spin_lock_irqsave(&clock_lock, flags);
if (likely(clk->ops && clk->ops->set_rate)) { if (likely(clk->ops && clk->ops->set_rate)) {
ret = clk->ops->set_rate(clk, rate, 0); ret = clk->ops->set_rate(clk, rate);
if (ret != 0) if (ret != 0)
goto out_unlock; goto out_unlock;
} else { } else {
@@ -647,8 +647,7 @@ static int clks_sysdev_suspend(struct sys_device *dev, pm_message_t state)
clkp->ops->set_parent(clkp, clkp->ops->set_parent(clkp,
clkp->parent); clkp->parent);
if (likely(clkp->ops->set_rate)) if (likely(clkp->ops->set_rate))
clkp->ops->set_rate(clkp, clkp->ops->set_rate(clkp, rate);
rate, 0);
else if (likely(clkp->ops->recalc)) else if (likely(clkp->ops->recalc))
clkp->rate = clkp->ops->recalc(clkp); clkp->rate = clkp->ops->recalc(clkp);
} }

5
drivers/sh/clk/cpg.c
View File

@@ -110,8 +110,7 @@ static int sh_clk_div6_set_parent(struct clk *clk, struct clk *parent)
return 0; return 0;
} }
static int sh_clk_div6_set_rate(struct clk *clk, static int sh_clk_div6_set_rate(struct clk *clk, unsigned long rate)
unsigned long rate, int algo_id)
{ {
unsigned long value; unsigned long value;
int idx; int idx;
@@ -253,7 +252,7 @@ static int sh_clk_div4_set_parent(struct clk *clk, struct clk *parent)
return 0; return 0;
} }
static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate, int algo_id) static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate)
{ {
struct clk_div4_table *d4t = clk->priv; struct clk_div4_table *d4t = clk->priv;
unsigned long value; unsigned long value;

2
include/linux/sh_clk.h
View File

@@ -23,7 +23,7 @@ struct clk_ops {
int (*enable)(struct clk *clk); int (*enable)(struct clk *clk);
void (*disable)(struct clk *clk); void (*disable)(struct clk *clk);
unsigned long (*recalc)(struct clk *clk); unsigned long (*recalc)(struct clk *clk);
int (*set_rate)(struct clk *clk, unsigned long rate, int algo_id); int (*set_rate)(struct clk *clk, unsigned long rate);
int (*set_parent)(struct clk *clk, struct clk *parent); int (*set_parent)(struct clk *clk, struct clk *parent);
long (*round_rate)(struct clk *clk, unsigned long rate); long (*round_rate)(struct clk *clk, unsigned long rate);
}; };