Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 35a96c739fd7624b8edff990a74b86b5a85342da

Authored by Paul Mundt
1 parent 9a1683d1dd
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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

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>

Showing 5 changed files with 8 additions and 12 deletions Side-by-side Diff

arch/arm/mach-shmobile/clock-sh7372.c
Diff comments   View file @ 35a96c7
... ... @@ -220,8 +220,7 @@
220 220 __raw_writel(__raw_readl(PLLC2CR) & ~0x80000000, PLLC2CR);
221 221 }
222 222  
223   -static int pllc2_set_rate(struct clk *clk,
224   - unsigned long rate, int algo_id)
  223 +static int pllc2_set_rate(struct clk *clk, unsigned long rate)
225 224 {
226 225 unsigned long value;
227 226 int idx;
... ... @@ -463,8 +462,7 @@
463 462 return 0;
464 463 }
465 464  
466   -static int fsidiv_set_rate(struct clk *clk,
467   - unsigned long rate, int algo_id)
  465 +static int fsidiv_set_rate(struct clk *clk, unsigned long rate)
468 466 {
469 467 int idx;
470 468  
arch/sh/kernel/cpu/sh4/clock-sh4-202.c
Diff comments   View file @ 35a96c7
... ... @@ -110,7 +110,7 @@
110 110 return 0;
111 111 }
112 112  
113   -static int shoc_clk_set_rate(struct clk *clk, unsigned long rate, int algo_id)
  113 +static int shoc_clk_set_rate(struct clk *clk, unsigned long rate)
114 114 {
115 115 unsigned long frqcr3;
116 116 unsigned int tmp;
drivers/sh/clk/core.c
Diff comments   View file @ 35a96c7
... ... @@ -461,7 +461,7 @@
461 461 spin_lock_irqsave(&clock_lock, flags);
462 462  
463 463 if (likely(clk->ops && clk->ops->set_rate)) {
464   - ret = clk->ops->set_rate(clk, rate, 0);
  464 + ret = clk->ops->set_rate(clk, rate);
465 465 if (ret != 0)
466 466 goto out_unlock;
467 467 } else {
... ... @@ -647,8 +647,7 @@
647 647 clkp->ops->set_parent(clkp,
648 648 clkp->parent);
649 649 if (likely(clkp->ops->set_rate))
650   - clkp->ops->set_rate(clkp,
651   - rate, 0);
  650 + clkp->ops->set_rate(clkp, rate);
652 651 else if (likely(clkp->ops->recalc))
653 652 clkp->rate = clkp->ops->recalc(clkp);
654 653 }
drivers/sh/clk/cpg.c
Diff comments   View file @ 35a96c7
... ... @@ -110,8 +110,7 @@
110 110 return 0;
111 111 }
112 112  
113   -static int sh_clk_div6_set_rate(struct clk *clk,
114   - unsigned long rate, int algo_id)
  113 +static int sh_clk_div6_set_rate(struct clk *clk, unsigned long rate)
115 114 {
116 115 unsigned long value;
117 116 int idx;
... ... @@ -253,7 +252,7 @@
253 252 return 0;
254 253 }
255 254  
256   -static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate, int algo_id)
  255 +static int sh_clk_div4_set_rate(struct clk *clk, unsigned long rate)
257 256 {
258 257 struct clk_div4_table *d4t = clk->priv;
259 258 unsigned long value;
include/linux/sh_clk.h
Diff comments   View file @ 35a96c7
... ... @@ -23,7 +23,7 @@
23 23 int (*enable)(struct clk *clk);
24 24 void (*disable)(struct clk *clk);
25 25 unsigned long (*recalc)(struct clk *clk);
26   - int (*set_rate)(struct clk *clk, unsigned long rate, int algo_id);
  26 + int (*set_rate)(struct clk *clk, unsigned long rate);
27 27 int (*set_parent)(struct clk *clk, struct clk *parent);
28 28 long (*round_rate)(struct clk *clk, unsigned long rate);
29 29 };