From patchwork Tue Oct 13 07:58:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 54823 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id D4F9723001 for ; Tue, 13 Oct 2015 07:58:08 +0000 (UTC) Received: by wicgb1 with SMTP id gb1sf5886376wic.3 for ; Tue, 13 Oct 2015 00:58:08 -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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=l1Jj3vRJtKKkxcxF49d37jOBEZJJxc/TFboX2JBEO1w=; b=ZDu/Znqa7lNuc9hepItTfBSDr0o95wrwXKD7IjkOg8iR1PgJgK5ckduDDEWnAGhqum 9g92304gjixYZcTgBm5Mrp3Rw61XYVkGRIg++zpi6Uh2OyAt8/zd9pvUSPjW3xAQlHTv TZbDYBZ9+0FuICi0Qapls4uzxNl/7x2Qv6+PXWiVipSBesILs19chseQJ9e7HYH8U+uF j4Obq4sZW5z352KJqh93581ldWbBOlyM7AiKVeUbaw53uWQn1kylWC9k4EHJEzQXBdUc hvw8LdQ82w7FR94iXa+MgG0+ZI/GsT0NxCarIVWxyW/UR/gV7nAMCsOCtjBK88yLyAsY ZydQ== X-Gm-Message-State: ALoCoQl2dfGaYd2+/Ag9M9Zixq1Lx+jurXCecR3yDqhB38xn7Jb4e+1DFlfxVZQvDyhdAINZln3c X-Received: by 10.194.118.65 with SMTP id kk1mr6647580wjb.5.1444723088183; Tue, 13 Oct 2015 00:58:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.19.162 with SMTP id 34ls361593lft.73.gmail; Tue, 13 Oct 2015 00:58:08 -0700 (PDT) X-Received: by 10.25.212.2 with SMTP id l2mr9299511lfg.118.1444723088034; Tue, 13 Oct 2015 00:58:08 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id li9si1330620lbc.121.2015.10.13.00.58.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Oct 2015 00:58:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbbck17 with SMTP id ck17so10037109lbb.1 for ; Tue, 13 Oct 2015 00:58:07 -0700 (PDT) X-Received: by 10.25.205.198 with SMTP id d189mr9446371lfg.72.1444723087772; Tue, 13 Oct 2015 00:58:07 -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.112.59.35 with SMTP id w3csp1968692lbq; Tue, 13 Oct 2015 00:58:06 -0700 (PDT) X-Received: by 10.112.181.71 with SMTP id du7mr14145975lbc.37.1444723086947; Tue, 13 Oct 2015 00:58:06 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id f196si1354310lfe.50.2015.10.13.00.58.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Oct 2015 00:58:06 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbbck17 with SMTP id ck17so10036570lbb.1 for ; Tue, 13 Oct 2015 00:58:06 -0700 (PDT) X-Received: by 10.25.17.149 with SMTP id 21mr9300584lfr.38.1444723086340; Tue, 13 Oct 2015 00:58:06 -0700 (PDT) Received: from uffe-Latitude-E6430s.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id d139sm279064lfe.31.2015.10.13.00.58.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Oct 2015 00:58:05 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson , linux-pm@vger.kernel.org Cc: Len Brown , Pavel Machek , Geert Uytterhoeven , Lina Iyer , Krzysztof Kozlowski Subject: [PATCH V2] PM / Domains: Rename *pm_genpd_poweron|poweroff() Date: Tue, 13 Oct 2015 09:58:02 +0200 Message-Id: <1444723082-23751-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 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.217.170 as permitted sender) smtp.mailfrom=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: , This is another step to get consistent names of functions in genpd. Let's rename the internal *pm_genpd_poweron|poweroff() into *genpd_poweron|poweroff(). Signed-off-by: Ulf Hansson --- Changes in v2: This patch was earlier a part of below patchset, but it needed a rebase. http://comments.gmane.org/gmane.linux.power-management.general/66480 --- drivers/base/power/domain.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 8724b47..6e1bcde 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -181,10 +181,10 @@ static int genpd_power_off(struct generic_pm_domain *genpd, bool timed) } /** - * genpd_queue_power_off_work - Queue up the execution of pm_genpd_poweroff(). + * genpd_queue_power_off_work - Queue up the execution of genpd_poweroff(). * @genpd: PM domait to power off. * - * Queue up the execution of pm_genpd_poweroff() unless it's already been done + * Queue up the execution of genpd_poweroff() unless it's already been done * before. */ static void genpd_queue_power_off_work(struct generic_pm_domain *genpd) @@ -192,16 +192,16 @@ static void genpd_queue_power_off_work(struct generic_pm_domain *genpd) queue_work(pm_wq, &genpd->power_off_work); } -static int pm_genpd_poweron(struct generic_pm_domain *genpd); +static int genpd_poweron(struct generic_pm_domain *genpd); /** - * __pm_genpd_poweron - Restore power to a given PM domain and its masters. + * __genpd_poweron - Restore power to a given PM domain and its masters. * @genpd: PM domain to power up. * * Restore power to @genpd and all of its masters so that it is possible to * resume a device belonging to it. */ -static int __pm_genpd_poweron(struct generic_pm_domain *genpd) +static int __genpd_poweron(struct generic_pm_domain *genpd) { struct gpd_link *link; int ret = 0; @@ -218,7 +218,7 @@ static int __pm_genpd_poweron(struct generic_pm_domain *genpd) list_for_each_entry(link, &genpd->slave_links, slave_node) { genpd_sd_counter_inc(link->master); - ret = pm_genpd_poweron(link->master); + ret = genpd_poweron(link->master); if (ret) { genpd_sd_counter_dec(link->master); goto err; @@ -244,15 +244,15 @@ static int __pm_genpd_poweron(struct generic_pm_domain *genpd) } /** - * pm_genpd_poweron - Restore power to a given PM domain and its masters. + * genpd_poweron - Restore power to a given PM domain and its masters. * @genpd: PM domain to power up. */ -static int pm_genpd_poweron(struct generic_pm_domain *genpd) +static int genpd_poweron(struct generic_pm_domain *genpd) { int ret; mutex_lock(&genpd->lock); - ret = __pm_genpd_poweron(genpd); + ret = __genpd_poweron(genpd); mutex_unlock(&genpd->lock); return ret; } @@ -315,14 +315,14 @@ static int genpd_dev_pm_qos_notifier(struct notifier_block *nb, } /** - * pm_genpd_poweroff - Remove power from a given PM domain. + * genpd_poweroff - Remove power from a given PM domain. * @genpd: PM domain to power down. * @is_async: PM domain is powered down from a scheduled work * * If all of the @genpd's devices have been suspended and all of its subdomains * have been powered down, remove power from @genpd. */ -static int pm_genpd_poweroff(struct generic_pm_domain *genpd, bool is_async) +static int genpd_poweroff(struct generic_pm_domain *genpd, bool is_async) { struct pm_domain_data *pdd; struct gpd_link *link; @@ -370,10 +370,10 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd, bool is_async) /* * If sd_count > 0 at this point, one of the subdomains hasn't - * managed to call pm_genpd_poweron() for the master yet after - * incrementing it. In that case pm_genpd_poweron() will wait + * managed to call genpd_poweron() for the master yet after + * incrementing it. In that case genpd_poweron() will wait * for us to drop the lock, so we can call .power_off() and let - * the pm_genpd_poweron() restore power for us (this shouldn't + * the genpd_poweron() restore power for us (this shouldn't * happen very often). */ ret = genpd_power_off(genpd, true); @@ -402,7 +402,7 @@ static void genpd_power_off_work_fn(struct work_struct *work) genpd = container_of(work, struct generic_pm_domain, power_off_work); mutex_lock(&genpd->lock); - pm_genpd_poweroff(genpd, true); + genpd_poweroff(genpd, true); mutex_unlock(&genpd->lock); } @@ -448,7 +448,7 @@ static int pm_genpd_runtime_suspend(struct device *dev) return 0; mutex_lock(&genpd->lock); - pm_genpd_poweroff(genpd, false); + genpd_poweroff(genpd, false); mutex_unlock(&genpd->lock); return 0; @@ -481,7 +481,7 @@ static int pm_genpd_runtime_resume(struct device *dev) } mutex_lock(&genpd->lock); - ret = __pm_genpd_poweron(genpd); + ret = __genpd_poweron(genpd); mutex_unlock(&genpd->lock); if (ret) @@ -694,7 +694,7 @@ static int pm_genpd_prepare(struct device *dev) /* * The PM domain must be in the GPD_STATE_ACTIVE state at this point, - * so pm_genpd_poweron() will return immediately, but if the device + * so genpd_poweron() will return immediately, but if the device * is suspended (e.g. it's been stopped by genpd_stop_dev()), we need * to make it operational. */ @@ -1793,7 +1793,7 @@ int genpd_dev_pm_attach(struct device *dev) dev->pm_domain->detach = genpd_dev_pm_detach; dev->pm_domain->sync = genpd_dev_pm_sync; - ret = pm_genpd_poweron(pd); + ret = genpd_poweron(pd); out: return ret ? -EPROBE_DEFER : 0;