diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-02-24 21:18:05 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-02-24 21:18:05 +0100 |
| commit | 17162a117cd0733ad1db728fa804e62ded9a87d6 (patch) | |
| tree | 24339c44f10e0d524baabb4bd7535f9dd42ec872 /drivers/opp/core.c | |
| parent | 8cbd468bdeb5ed3acac2d7a9f7494d5b77e46297 (diff) | |
| parent | 1222d527f314c86a3b59a522115d62facc5a7965 (diff) | |
| download | linux-17162a117cd0733ad1db728fa804e62ded9a87d6.tar.bz2 | |
Merge back earlier cpufreq material for v5.1.
Diffstat (limited to 'drivers/opp/core.c')
| -rw-r--r-- | drivers/opp/core.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 18f1639dbc4a..4e00301060cf 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -533,9 +533,8 @@ static int _set_opp_voltage(struct device *dev, struct regulator *reg, return ret; } -static inline int -_generic_set_opp_clk_only(struct device *dev, struct clk *clk, - unsigned long old_freq, unsigned long freq) +static inline int _generic_set_opp_clk_only(struct device *dev, struct clk *clk, + unsigned long freq) { int ret; @@ -572,7 +571,7 @@ static int _generic_set_opp_regulator(const struct opp_table *opp_table, } /* Change frequency */ - ret = _generic_set_opp_clk_only(dev, opp_table->clk, old_freq, freq); + ret = _generic_set_opp_clk_only(dev, opp_table->clk, freq); if (ret) goto restore_voltage; @@ -586,7 +585,7 @@ static int _generic_set_opp_regulator(const struct opp_table *opp_table, return 0; restore_freq: - if (_generic_set_opp_clk_only(dev, opp_table->clk, freq, old_freq)) + if (_generic_set_opp_clk_only(dev, opp_table->clk, old_freq)) dev_err(dev, "%s: failed to restore old-freq (%lu Hz)\n", __func__, old_freq); restore_voltage: @@ -759,7 +758,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) opp->supplies); } else { /* Only frequency scaling */ - ret = _generic_set_opp_clk_only(dev, clk, old_freq, freq); + ret = _generic_set_opp_clk_only(dev, clk, freq); } /* Scaling down? Configure required OPPs after frequency */ |