On 25-11-16, 17:50, Arnd Bergmann wrote:
> 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 <[email protected]>
> ---
> drivers/cpufreq/intel_pstate.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
> index 7159dbde0160..8921686b8cd2 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -474,11 +474,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
Acked-by: Viresh Kumar <[email protected]>
--
viresh
