diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-21 06:00:46 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-21 06:00:46 +0300 |
| commit | 3549d82279370295a11f1dec0284a9922c903b9a (patch) | |
| tree | 45bc3960c75546ce6e5a7f3950cae5a94891f040 /include | |
| parent | 9638685e32af961943b679fcb72d4ddd458eb18f (diff) | |
| parent | 6575a9c69a211ac1cf454f9c76be54f7a5fae9fe (diff) | |
| download | linux-3549d82279370295a11f1dec0284a9922c903b9a.tar.xz | |
Merge tag 'renesas-sh-drivers-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
Pull SH driver updates from Simon Horman:
"Clean up the clock API on legacy SH to make it more similar to the
Common Clock Framework. This will avoid different behaviour in
drivers shared between legacy and CCF-based platforms (e.g. SCIF)"
* tag 'renesas-sh-drivers-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
drivers: sh: clk: Avoid crashes when passing NULL clocks
drivers: sh: clk: Remove obsolete and unused clk_round_parent()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sh_clk.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h index 1f208b2a1ed6..645896b81244 100644 --- a/include/linux/sh_clk.h +++ b/include/linux/sh_clk.h @@ -113,10 +113,6 @@ long clk_rate_div_range_round(struct clk *clk, unsigned int div_min, long clk_rate_mult_range_round(struct clk *clk, unsigned int mult_min, unsigned int mult_max, unsigned long rate); -long clk_round_parent(struct clk *clk, unsigned long target, - unsigned long *best_freq, unsigned long *parent_freq, - unsigned int div_min, unsigned int div_max); - #define SH_CLK_MSTP(_parent, _enable_reg, _enable_bit, _status_reg, _flags) \ { \ .parent = _parent, \ |