On Wed, Nov 27, 2013 at 05:26:03PM +0100, Thierry Reding wrote:
> clk_round_rate() can be used by drivers to determine whether or not a
> frequency is supported by the clock. The current Tegra clock driver
> outputs an error message and a stacktrace when the requested rate isn't
> supported. That's fine for clk_set_rate(), but it's confusing when all
> the driver does is query whether or not a frequency is supported.
>
> Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
> ---
> drivers/clk/tegra/clk-pll.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
Cc'ing Stefan, since he reported this error or IRC. Stefan, can you
check whether this fixes the issue you were seeing? In case you're not
subscribed, please let me know and I'll resend the patch.
Peter, if you're fine with applying as-is, can you add this:
Reported-by: Stefan Agner <stefan@xxxxxxxx>
to give proper credit?
Thanks,
Thierry
>
> diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c
> index 7aec773a5ca6..55ece6726108 100644
> --- a/drivers/clk/tegra/clk-pll.c
> +++ b/drivers/clk/tegra/clk-pll.c
> @@ -435,9 +435,6 @@ static int _calc_rate(struct clk_hw *hw, struct tegra_clk_pll_freq_table *cfg,
> if (cfg->m > divm_max(pll) || cfg->n > divn_max(pll) ||
> (1 << p_div) > divp_max(pll)
> || cfg->output_rate > pll->params->vco_max) {
> - pr_err("%s: Failed to set %s rate %lu\n",
> - __func__, __clk_get_name(hw->clk), rate);
> - WARN_ON(1);
> return -EINVAL;
> }
>
> @@ -584,6 +581,8 @@ static int clk_pll_set_rate(struct clk_hw *hw, unsigned long rate,
>
> if (_get_table_rate(hw, &cfg, rate, parent_rate) &&
> _calc_rate(hw, &cfg, rate, parent_rate)) {
> + pr_err("%s: Failed to set %s rate %lu\n", __func__,
> + __clk_get_name(hw->clk), rate);
> WARN_ON(1);
> return -EINVAL;
> }
> @@ -615,10 +614,8 @@ static long clk_pll_round_rate(struct clk_hw *hw, unsigned long rate,
> return __clk_get_rate(hw->clk);
>
> if (_get_table_rate(hw, &cfg, rate, *prate) &&
> - _calc_rate(hw, &cfg, rate, *prate)) {
> - WARN_ON(1);
> + _calc_rate(hw, &cfg, rate, *prate))
> return -EINVAL;
> - }
>
> return cfg.output_rate;
> }
> --
> 1.8.4.2
>
Attachment:
pgphgZ5hipjBN.pgp
Description: PGP signature
