projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'opp/power' into cpufreq/qcom-hw
[linux-2.6-block.git]
/
drivers
/
opp
/
core.c
diff --git
a/drivers/opp/core.c
b/drivers/opp/core.c
index 18f1639dbc4a601d951330ea179335cb704ce660..4e00301060cf4d4d5e15ba12c9624fdea430ea7e 100644
(file)
--- 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;
}
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;
{
int ret;
@@
-572,7
+571,7
@@
static int _generic_set_opp_regulator(const struct opp_table *opp_table,
}
/* Change frequency */
}
/* 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;
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:
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:
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 */
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 */
}
/* Scaling down? Configure required OPPs after frequency */