summaryrefslogtreecommitdiff
path: root/drivers/cpufreq/cpufreq.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-07 21:11:43 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-07 21:11:43 (GMT)
commit1133bfa6dcf034639486982629d29472737d5e96 (patch)
tree8ab074d3dc96defa0e4b2032ecfc9cf38b86caef /drivers/cpufreq/cpufreq.c
parentd8d3b4711297e101bbad826474013edbe342c333 (diff)
parentcffe4e0e7413eb29fb8bd035c8b12b33a4b8522a (diff)
downloadlinux-1133bfa6dcf034639486982629d29472737d5e96.tar.xz
Merge branch 'pm-cpufreq-ondemand' into pm-cpufreq
* pm-cpufreq: cpufreq: Remove unused function __cpufreq_driver_getavg() cpufreq: Remove unused APERF/MPERF support cpufreq: ondemand: Change the calculation of target frequency
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
-rw-r--r--drivers/cpufreq/cpufreq.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 1faf320..e34bd94 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1670,18 +1670,6 @@ fail:
}
EXPORT_SYMBOL_GPL(cpufreq_driver_target);
-int __cpufreq_driver_getavg(struct cpufreq_policy *policy, unsigned int cpu)
-{
- if (cpufreq_disabled())
- return 0;
-
- if (!cpufreq_driver->getavg)
- return 0;
-
- return cpufreq_driver->getavg(policy, cpu);
-}
-EXPORT_SYMBOL_GPL(__cpufreq_driver_getavg);
-
/*
* when "event" is CPUFREQ_GOV_LIMITS
*/