diff options
author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2014-12-02 08:54:22 +0100 |
---|---|---|
committer | Michael Turquette <mturquette@linaro.org> | 2014-12-03 16:21:37 -0800 |
commit | 646cafc6aa4d6004d189de1cdc267ab562069ba9 (patch) | |
tree | 6d2f85aecfe37696c0930b1dce17722e863cc804 /drivers/clk/mmp | |
parent | 61c7cddfad266ebb86176723f9c679f25cf705fe (diff) | |
download | linux-646cafc6aa4d6004d189de1cdc267ab562069ba9.tar.bz2 |
clk: Change clk_ops->determine_rate to return a clk_hw as the best parent
This is in preparation for clock providers to not have to deal with struct clk.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Michael Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/mmp')
-rw-r--r-- | drivers/clk/mmp/clk-mix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/mmp/clk-mix.c b/drivers/clk/mmp/clk-mix.c index b79742c47d53..48fa53c7ce5e 100644 --- a/drivers/clk/mmp/clk-mix.c +++ b/drivers/clk/mmp/clk-mix.c @@ -203,7 +203,7 @@ error: static long mmp_clk_mix_determine_rate(struct clk_hw *hw, unsigned long rate, unsigned long *best_parent_rate, - struct clk **best_parent_clk) + struct clk_hw **best_parent_clk) { struct mmp_clk_mix *mix = to_clk_mix(hw); struct mmp_clk_mix_clk_table *item; @@ -264,7 +264,7 @@ static long mmp_clk_mix_determine_rate(struct clk_hw *hw, unsigned long rate, found: *best_parent_rate = parent_rate_best; - *best_parent_clk = parent_best; + *best_parent_clk = __clk_get_hw(parent_best); return mix_rate_best; } |