From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752059AbdF3QJm (ORCPT ); Fri, 30 Jun 2017 12:09:42 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:59537 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751560AbdF3QJk (ORCPT ); Fri, 30 Jun 2017 12:09:40 -0400 From: Arnd Bergmann To: "Rafael J. Wysocki" Cc: Arnd Bergmann , Kevin Hilman , Ulf Hansson , Pavel Machek , Len Brown , Greg Kroah-Hartman , Jon Hunter , Lina Iyer , Krzysztof Kozlowski , Mikko Perttunen , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] PM / Domains: avoid unused function warning Date: Fri, 30 Jun 2017 18:09:13 +0200 Message-Id: <20170630160921.4192052-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:s1ojfZbRzyBWWcMgVHDNuzP5ZgjsmxHd9GEINyfIDkeZGOGqWIk muGzODmofG+s28Z1qeuPLZJlZcdeBo5L4je3cWLwBwQygwzxMm8PXxzMl0sEVABHihMpixk 6X4a3a5T2o5K6FPueAlr2v0GFO9PnHJz/sGHLslx4g+3I6mnUaEKO9Bgp2cq7CpTbgI9kTa yOmGygPXlceDpSWO5rwqg== X-UI-Out-Filterresults: notjunk:1;V01:K0:YK62u05Zjaw=:vGY6t0WPLpuZdwQrnOs3fC YxE+/pjcZmZxrUZLk1OR58J/jZFh+3sQRlsU0ZSnMKBCjmqDwG5CB+ZDfzJ7y7zy4bjAnt7Yx AB02xHMJOhYeBRDYyIMk12K1aE64rrKoMHV9pPpHalhCXM4n936jWgXDWxOkxVI5ir5JEKx68 aV6zLKwG2PLCkGkpJWemx0xXrzQLd0/rCZAd85RKShOSvaOC24yXTI/7VaaSeYrXLwHC+W8/7 uwEOjX03w81W7iB4Bhq4KLp3BJslv+kOg3SckT55yPHp0kH+PCuY4BioVfgG3GHiL2SlcUuaR 33awYc/TBUJM4Y26IKwuMYZdfRtG5TqsngOFkZlxRDSPY54dG6TkdjemapXFfflaaulDL7pLS IPkIckrErB4O00RxqWgLq4gwCUoxUIeJy5JT4qVlpA8JqoaDcXo2P/D44YAAwbk0fMWklZMyu JxfbLzwzINcyhN87IqU50Ofghsh0dlXt+Yf8FqtXQpHH9kV3jzD5c9sULHu38mi11TzZcJibn ALe8nffJSwIk/CnZ6gWYAGab1HzJHZDXyyzmGqHr5wVGkJX4V/Z7qKDBQhSJFdpeGGNRyQKP7 meRxTIrMEGc2cGiZpf20QUwmeLyU8IOI5DHUPmHVXyDhLbb568Ko8xWdLif54jNp64hrHYDZN ZNHaiGrccNiJagzXxMLd+DQlS+upMXNWSJJjbBh76vrjaS2ukH7pn9BjQEBMkdv1OBis= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The only caller of pm_genpd_present outside of CONFIG_PM_GENERIC_DOMAINS_OF was removed, so we now get a warning when that is disabled: drivers/base/power/domain.c:725:13: error: 'pm_genpd_present' defined but not used [-Werror=unused-function] This moves the function definition inside of the #ifdef section. Fixes: 8b55e55ee443 ("PM / Domains: Handle safely genpd_syscore_switch() call on non-genpd device") Signed-off-by: Arnd Bergmann --- drivers/base/power/domain.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 7eca0f0cbc3b..a380d9d61335 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -716,28 +716,6 @@ static int __init genpd_power_off_unused(void) } late_initcall(genpd_power_off_unused); -#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_GENERIC_DOMAINS_OF) - -/** - * pm_genpd_present - Check if the given PM domain has been initialized. - * @genpd: PM domain to check. - */ -static bool pm_genpd_present(const struct generic_pm_domain *genpd) -{ - const struct generic_pm_domain *gpd; - - if (IS_ERR_OR_NULL(genpd)) - return false; - - list_for_each_entry(gpd, &gpd_list, gpd_list_node) - if (gpd == genpd) - return true; - - return false; -} - -#endif - #ifdef CONFIG_PM_SLEEP static bool genpd_dev_active_wakeup(const struct generic_pm_domain *genpd, @@ -1675,6 +1653,24 @@ static LIST_HEAD(of_genpd_providers); static DEFINE_MUTEX(of_genpd_mutex); /** + * pm_genpd_present - Check if the given PM domain has been initialized. + * @genpd: PM domain to check. + */ +static bool pm_genpd_present(const struct generic_pm_domain *genpd) +{ + const struct generic_pm_domain *gpd; + + if (IS_ERR_OR_NULL(genpd)) + return false; + + list_for_each_entry(gpd, &gpd_list, gpd_list_node) + if (gpd == genpd) + return true; + + return false; +} + +/** * genpd_xlate_simple() - Xlate function for direct node-domain mapping * @genpdspec: OF phandle args to map into a PM domain * @data: xlate function private data - pointer to struct generic_pm_domain -- 2.9.0