From patchwork Fri Nov 25 16:50:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101454 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp190854qgi; Fri, 25 Nov 2016 08:51:18 -0800 (PST) X-Received: by 10.84.197.165 with SMTP id n34mr19875341pld.34.1480092678792; Fri, 25 Nov 2016 08:51:18 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i13si45419413pgp.325.2016.11.25.08.51.18; Fri, 25 Nov 2016 08:51:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933014AbcKYQu7 (ORCPT + 13 others); Fri, 25 Nov 2016 11:50:59 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:64300 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933007AbcKYQuv (ORCPT ); Fri, 25 Nov 2016 11:50:51 -0500 Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MFKXk-1byCkm3VBc-00ELCv; Fri, 25 Nov 2016 17:50:41 +0100 From: Arnd Bergmann To: Srinivas Pandruvada Cc: Arnd Bergmann , Len Brown , "Rafael J. Wysocki" , Viresh Kumar , Philippe Longepe , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] cpufreq: intel_pstate: fix intel_pstate_exit_perf_limits prototype Date: Fri, 25 Nov 2016 17:50:20 +0100 Message-Id: <20161125165036.195969-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 MIME-Version: 1.0 X-Provags-ID: V03:K0:2CP744zJs/Cytyk6MVRV0oVoW9KwY0hdy9WqHiOawNMUVLMtKGA IbsGvmBa503RRgwjoJungd4saWR6Xg0dKh4BCrJipf3Wdy+WGbHVgTZcrE5NWxnYg7B4RH4 Pw7iLGnhmWAFcM0ssBf8eRWmR2uukytSiFfQSSz2U97VHme3FwrYM2hgZmzIsN6nTj2CeD+ j7Ek1qrmrStGPzSq48V+Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:f0/5AMq/4rk=:/W64vUMT/Xni8HSceCytR7 tBDCz+lTV+aRUQq/TH85dAopBDXVDhQUR4ERlArx3eiVH4Q8BZFJzwp0lErXp5CWs+Gac3mqm zN/kjku14eQhAsZA6OeV3rDSyzW9w2si3UWD8q37/LwQtem8+EtC+f4w5jYFWzzHrJnU0KTSr TQDZvB1zUlGwO01+zRlTClswz1/oq8gcZ+psMc7wXRqqI4tR5yOA7ElUlFwZWRVbkdbm1Gicl oWViD7J4o8Iy8OZwf/Od7MTcvSvssdZZQMYhcBkeAm2zhJxb3xPrA9aEZRvCgrfU9h9SpjtT8 aO2xB6VJr0EEo/G9tlMhWVzs8aMUzPgdave2s/xnFJI6WxuJSRUFuVkd6XKvyA7RNJsnSYR1E /57PHzngeeXbiSAoI5V3K/cCsZrblOoxexwjVWgLkYcMsz9iu1JWXgwTdm8ZM+KQMYaf3zohp bFzfgWbL084pzEwVqwRcm5CcS4xe97it6C7CqI9kgLStBVQnf8UDGIsiNs8WO2y3Ta7Z6BFUD V7xNgATOIw4hRRiMr9eiJKyZ4GPCWTutvNWHn324/HLgToVCV/2p1jX0SmxqV2z1rlEJhuq9m ZRKhFM9gAqC3vM4GCDt29If9nrMBmgPTPtoHnWOKONqcsr9pZmJkDspy75gdAZgt+lnMG3/Yu QeMl/YCS38auFUjmpOumn05kReEnAYY1fPVXUJ+OhX3FHKu1l6QpGPRsOX83oHW/wGDNlXBO0 N6ueCbnT7pgIVK9K Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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 --- drivers/cpufreq/intel_pstate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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