diff options
| author | Arnd Bergmann | 2016-11-25 17:50:20 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2016-11-28 14:24:21 +0100 |
| commit | 7a3ba767f6bf9d98f1c823417908719af4a22a65 (patch) | |
| tree | 06f389328ab4954b786fddb1af1096a360e78d06 /drivers/cpufreq/intel_pstate.c | |
| parent | cpufreq: intel_pstate: Set EPP/EPB to 0 in performance mode (diff) | |
| download | kernel-qcow2-linux-7a3ba767f6bf9d98f1c823417908719af4a22a65.tar.gz kernel-qcow2-linux-7a3ba767f6bf9d98f1c823417908719af4a22a65.tar.xz kernel-qcow2-linux-7a3ba767f6bf9d98f1c823417908719af4a22a65.zip | |
cpufreq: intel_pstate: fix intel_pstate_exit_perf_limits() prototype
The addition of the generic governor support marked the
intel_pstate_exit_perf_limits as inline(), which fixed a warning,
but it introduced another warning:
drivers/cpufreq/intel_pstate.c: In function ‘intel_pstate_exit_perf_limits’:
drivers/cpufreq/intel_pstate.c:483:1: error: no return statement in function returning non-void [-Werror=return-type]
This changes it back to a 'void' return type, and changes the
corresponding intel_pstate_init_acpi_perf_limits() function to
be inline as well for consistency.
Fixes: 001c76f05b01 (cpufreq: intel_pstate: Generic governors support)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq/intel_pstate.c')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 0b90a63de46d..c20da85d7713 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -479,11 +479,11 @@ static void intel_pstate_exit_perf_limits(struct cpufreq_policy *policy) } #else -static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy) +static inline void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy) { } -static inline int intel_pstate_exit_perf_limits(struct cpufreq_policy *policy) +static inline void intel_pstate_exit_perf_limits(struct cpufreq_policy *policy) { } #endif |