From patchwork Tue Jun 10 10:51:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 4328261 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AAA25BEEAA for ; Tue, 10 Jun 2014 10:59:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DBC4E20260 for ; Tue, 10 Jun 2014 10:59:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E802520204 for ; Tue, 10 Jun 2014 10:59:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WuJjr-0001sc-5s; Tue, 10 Jun 2014 10:57:11 +0000 Received: from mail-lb0-f173.google.com ([209.85.217.173]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WuJfw-00056w-0q for linux-arm-kernel@lists.infradead.org; Tue, 10 Jun 2014 10:53:08 +0000 Received: by mail-lb0-f173.google.com with SMTP id 10so3793604lbg.4 for ; Tue, 10 Jun 2014 03:52:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rLghzO2edhfEBOuJFO4UeosIy8G7lvJ65i2+REXoq7k=; b=WRNkBviGV1m1h/p9vz1KsDkL6GMW7DHlz7nAbT/Hu223pg2QthZBwDB3JPoST7AuvX gRLZ6SslJBlPoXA4qy5CVzpDSrNBh/GitzTGKujIIqBPVgieOxrQ6pVduH7WwgixcQA0 R86yoiAOeGG0J8dhF5+AQUKAcZOwT3DWk+IuNgC9FiWrqlhVR5yc/RitXORu5Ke6Gjau 56JjCCshHXiDNq4InETVt4O20/UlVqlMhi5PteqVpp9VkdFnl5DWmkibyeWOdqIOdDXT T+x4I7/5k0o6GmqlZ4dOvGm+a226x8oPiBAqg+QiqZrhB6Fc7544TCd1MfMQ4WodMjHF NNdA== X-Gm-Message-State: ALoCoQmNzIxoG0mb2YwN/aki10effGIYBGz4IiL+lmY/RXjDmV3dFbEONBZr2/Wo3i7viSO3h287 X-Received: by 10.152.36.134 with SMTP id q6mr21978722laj.29.1402397568749; Tue, 10 Jun 2014 03:52:48 -0700 (PDT) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id y6sm18329925laj.17.2014.06.10.03.52.46 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Jun 2014 03:52:48 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Subject: [PATCH 18/24] PM / Domains: Remove default_stop_ok() API Date: Tue, 10 Jun 2014 12:51:31 +0200 Message-Id: <1402397497-26737-19-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1402397497-26737-1-git-send-email-ulf.hansson@linaro.org> References: <1402397497-26737-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140610_035308_257333_815508A8 X-CRM114-Status: GOOD ( 12.84 ) X-Spam-Score: -0.7 (/) Cc: devicetree@vger.kernel.org, Ulf Hansson , Kevin Hilman , Philipp Zabel , Greg Kroah-Hartman , Linus Walleij , Daniel Lezcano , Magnus Damm , Tomasz Figa , Simon Horman , Alan Stern , Mark Brown , Ben Dooks , Kukjin Kim , Stephen Boyd , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There are currently no need to export default_stop_ok() as an API, instead let's keep it local to the domain governor. Signed-off-by: Ulf Hansson --- drivers/base/power/domain_governor.c | 7 ++----- include/linux/pm_domain.h | 9 +-------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/base/power/domain_governor.c b/drivers/base/power/domain_governor.c index a089e3b..d88a62e 100644 --- a/drivers/base/power/domain_governor.c +++ b/drivers/base/power/domain_governor.c @@ -42,7 +42,7 @@ static int dev_update_qos_constraint(struct device *dev, void *data) * default_stop_ok - Default PM domain governor routine for stopping devices. * @dev: Device to check. */ -bool default_stop_ok(struct device *dev) +static bool default_stop_ok(struct device *dev) { struct gpd_timing_data *td = &dev_gpd_data(dev)->td; unsigned long flags; @@ -229,10 +229,7 @@ static bool always_on_power_down_ok(struct dev_pm_domain *domain) #else /* !CONFIG_PM_RUNTIME */ -bool default_stop_ok(struct device *dev) -{ - return false; -} +static inline bool default_stop_ok(struct device *dev) { return false; } #define default_power_down_ok NULL #define always_on_power_down_ok NULL diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 5cd8000..e94d8ae 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -116,8 +116,6 @@ static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) return to_gpd_data(dev->power.subsys_data->domain_data); } -extern struct dev_power_governor simple_qos_governor; - extern struct generic_pm_domain *dev_to_genpd(struct device *dev); extern int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, @@ -146,8 +144,7 @@ extern void pm_genpd_init(struct generic_pm_domain *genpd, extern int pm_genpd_poweron(struct generic_pm_domain *genpd); extern int pm_genpd_name_poweron(const char *domain_name); -extern bool default_stop_ok(struct device *dev); - +extern struct dev_power_governor simple_qos_governor; extern struct dev_power_governor pm_domain_always_on_gov; #else @@ -220,10 +217,6 @@ static inline int pm_genpd_name_poweron(const char *domain_name) { return -ENOSYS; } -static inline bool default_stop_ok(struct device *dev) -{ - return false; -} #define simple_qos_governor NULL #define pm_domain_always_on_gov NULL #endif