]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
cpufreq: intel_pstate: fix intel_pstate_exit_perf_limits() prototype
authorArnd Bergmann <arnd@arndb.de>
Fri, 25 Nov 2016 16:50:20 +0000 (17:50 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 28 Nov 2016 13:24:21 +0000 (14:24 +0100)
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>
drivers/cpufreq/intel_pstate.c

index 0b90a63de46d9d31a00497056fa87808ec283d3e..c20da85d771311e74b778748f1083e61a6945c6e 100644 (file)
@@ -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