From patchwork Tue Oct 6 12:28:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 54531 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by patches.linaro.org (Postfix) with ESMTPS id 94BCA22FC5 for ; Tue, 6 Oct 2015 12:28:05 +0000 (UTC) Received: by lbbti1 with SMTP id ti1sf47598379lbb.3 for ; Tue, 06 Oct 2015 05:28:04 -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=3VN6CaDHYO1cOdSmmki/8m+ShblpUbVxRreTtqtznJo=; b=dCHSDEf+5aIMAY0sqG+JOPPBrVl/0E7Se6MK+lJLpIFK1CoEkHg36OrXvLWl3roTIP hqZnDw3uGL5Eoqxo+N71/eOYZ7UjOp/d+EEfVVNW+hT8BjgY7oUxcXSh4PDBVZU1F1XE c3GbSaPt6e8RkBmLnqbKCB4w+JgPA48tGxLktk9JUYjUPYKqK/D8o88rqqsuCrVKakxk pZ//f69ChLrpg7AGd1e+9FGEi0iGH88jdAKG7mdvEv9tJTv3ObW3uNTw6Evv90tT33B0 q3UpF4RtB1SPy/sawJn7n567YiJsQgx1fX41K+aAZsDhmDTMBjbGlDmWTtXlWZW963oL H9OA== X-Gm-Message-State: ALoCoQn4DDkWy3giIGHMWDxHeEqoArTOCSwJSga8GkYsDg3czLNEAfZeuCINR1POI4majPzFf638 X-Received: by 10.112.169.34 with SMTP id ab2mr6318401lbc.23.1444134484538; Tue, 06 Oct 2015 05:28:04 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.87.139 with SMTP id l133ls550963lfb.34.gmail; Tue, 06 Oct 2015 05:28:04 -0700 (PDT) X-Received: by 10.112.131.70 with SMTP id ok6mr13539963lbb.71.1444134484409; Tue, 06 Oct 2015 05:28:04 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id o141si20748779lfo.58.2015.10.06.05.28.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 05:28:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by labzv5 with SMTP id zv5so143161659lab.1 for ; Tue, 06 Oct 2015 05:28:04 -0700 (PDT) X-Received: by 10.112.146.104 with SMTP id tb8mr14767027lbb.35.1444134484296; Tue, 06 Oct 2015 05:28:04 -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 w3csp1821202lbq; Tue, 6 Oct 2015 05:28:03 -0700 (PDT) X-Received: by 10.112.169.98 with SMTP id ad2mr14086814lbc.2.1444134483820; Tue, 06 Oct 2015 05:28:03 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id a197si20739638lfe.97.2015.10.06.05.28.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Oct 2015 05:28:03 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by lacdq7 with SMTP id dq7so399765lac.2 for ; Tue, 06 Oct 2015 05:28:03 -0700 (PDT) X-Received: by 10.112.150.67 with SMTP id ug3mr14666829lbb.13.1444134483657; Tue, 06 Oct 2015 05:28:03 -0700 (PDT) Received: from localhost.localdomain (c-83-233-167-104.cust.bredband2.com. [83.233.167.104]) by smtp.gmail.com with ESMTPSA id ug9sm5174355lbb.22.2015.10.06.05.28.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Oct 2015 05:28:02 -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 4/4] PM / Domains: Rename *pm_genpd_poweron|poweroff() Date: Tue, 6 Oct 2015 14:28:00 +0200 Message-Id: <1444134480-18021-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.215.50 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 --- 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 c2c0de9..cda63e5 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,13 +315,13 @@ 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. * * 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) +static int genpd_poweroff(struct generic_pm_domain *genpd) { struct pm_domain_data *pdd; struct gpd_link *link; @@ -369,10 +369,10 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd) /* * 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); @@ -401,7 +401,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); + genpd_poweroff(genpd); mutex_unlock(&genpd->lock); } @@ -448,7 +448,7 @@ static int pm_genpd_runtime_suspend(struct device *dev) mutex_lock(&genpd->lock); genpd->in_progress++; - pm_genpd_poweroff(genpd); + genpd_poweroff(genpd); genpd->in_progress--; mutex_unlock(&genpd->lock); @@ -482,7 +482,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) @@ -695,7 +695,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. */ @@ -1795,7 +1795,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;