Loading drivers/opp/core.c +5 −6 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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; Loading @@ -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: Loading Loading @@ -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 */ Loading Loading
drivers/opp/core.c +5 −6 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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; Loading @@ -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: Loading Loading @@ -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 */ Loading