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: 31639 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f198.google.com (mail-ig0-f198.google.com [209.85.213.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5396D20675 for ; Tue, 10 Jun 2014 10:52:51 +0000 (UTC) Received: by mail-ig0-f198.google.com with SMTP id uq10sf16978754igb.1 for ; Tue, 10 Jun 2014 03:52:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=rLghzO2edhfEBOuJFO4UeosIy8G7lvJ65i2+REXoq7k=; b=jUDy5UVZyfc9T6qf1hGulvUYf7NHrPEnMHzEQ/gY8HTZFR1Cjscknx96iQ1SeP77dp pZKHNN7wewTtbd1o9VaAzCCamnw/wX3BCRrta0Fo0yJMlrs/0ARw1KbGB3RPjtmEdP4f VDWRPsoR8Axh2cXUmGTfDMfCxu747fc11Aj2jQiiAhh5gihzsPxixQot5kNwzHCTQ2Qf 1lvUJcBuGBGu5EG33NT85djIuMq/bmVlyCoeRAkhuxBJr65RxSR/L+nJicnRhuMsXs6q og9oK6/4ZAjtOz77EnUazV1thPs8odY9ZcMbWIKc0rhDWvfgaH/fxchfHwTEFSqw3+hc iLLw== X-Gm-Message-State: ALoCoQlyRWzb9/tz7rZQUCVNqmR/RqVLE3aQTwyXueO+kDfVW0QiYhSRwes0TYIZp+F1wLQpo5AD X-Received: by 10.182.106.229 with SMTP id gx5mr1354836obb.31.1402397570909; Tue, 10 Jun 2014 03:52:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.229 with SMTP id j92ls1982070qgf.14.gmail; Tue, 10 Jun 2014 03:52:50 -0700 (PDT) X-Received: by 10.58.74.3 with SMTP id p3mr64943vev.77.1402397570733; Tue, 10 Jun 2014 03:52:50 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id 20si12908178vdd.100.2014.06.10.03.52.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Jun 2014 03:52:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.181 as permitted sender) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id db11so2560175veb.12 for ; Tue, 10 Jun 2014 03:52:50 -0700 (PDT) X-Received: by 10.52.184.164 with SMTP id ev4mr26309473vdc.15.1402397570642; Tue, 10 Jun 2014 03:52:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp215575vcb; Tue, 10 Jun 2014 03:52:50 -0700 (PDT) X-Received: by 10.152.4.201 with SMTP id m9mr1542508lam.50.1402397569395; Tue, 10 Jun 2014 03:52:49 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com [209.85.215.51]) by mx.google.com with ESMTPS id xs1si41855291lbb.39.2014.06.10.03.52.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Jun 2014 03:52:49 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id gf5so3867756lab.10 for ; Tue, 10 Jun 2014 03:52:48 -0700 (PDT) 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 Cc: linux-arm-kernel@lists.infradead.org, Kevin Hilman , Alan Stern , Greg Kroah-Hartman , Daniel Lezcano , Tomasz Figa , devicetree@vger.kernel.org, Linus Walleij , Simon Horman , Magnus Damm , Ben Dooks , Kukjin Kim , Stephen Boyd , Philipp Zabel , Mark Brown , Ulf Hansson 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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