From patchwork Wed Sep 21 13:38:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 76688 Delivered-To: patches@linaro.org Received: by 10.140.106.72 with SMTP id d66csp2056391qgf; Wed, 21 Sep 2016 06:39:06 -0700 (PDT) X-Received: by 10.46.1.148 with SMTP id f20mr14316741lji.47.1474465146009; Wed, 21 Sep 2016 06:39:06 -0700 (PDT) Return-Path: Received: from mail-lf0-x22d.google.com (mail-lf0-x22d.google.com. [2a00:1450:4010:c07::22d]) by mx.google.com with ESMTPS id e30si14769291lfi.38.2016.09.21.06.39.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Sep 2016 06:39:06 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::22d as permitted sender) client-ip=2a00:1450:4010:c07::22d; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::22d as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x22d.google.com with SMTP id b71so14719469lfg.0 for ; Wed, 21 Sep 2016 06:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uG3Jl7wc3ml2u/h+C5HokGRsdApoQ8xX4/AWLkRBjzI=; b=KGvXA1c4QSrUEjKOKlgrp+eCGdhEDAQuEZlylKvJe+2GGUXy/8NN+tjFGyHcspCCbl Hi+gvw9turmBMhesuN7MOxi3Of7ExQidndXCcaN6Ku807MuHNl5Mc0Af+SP0nTJWd6XW gtcMVeLqVy1ktjN1QhoedINs/Ekc5rQrzsvkc= 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=uG3Jl7wc3ml2u/h+C5HokGRsdApoQ8xX4/AWLkRBjzI=; b=FgkXcCzNyiKFnb0uQw++o4Ggy2BPaHV2Pp9EXq6r+tVzxbrpcPWp60nr1sWu40N34P Cge2Lfr7ivySO1kpcfOcPby1P2Znvby9aqWdE0WZcqBhdeV8HsEqubFF53kOgRcPTgmC TwecKy4W7dvE+G/+aiUjQUTyV4T94us9s8u9qyj0Y7iI88VcKIVR3eNWgqGIz+XTcVoi 1WCP3zqfoSeQc/ATaSMiE/x7yxeqL0XLOTtjWcndBGRzpt4QMBvhahp7JfuWbr8CAe/l uEvgRm8n/p5RJtFwNkNXbheQIENqWLP7ktpohFu2VgppaOK9uzsIc+/WL/cmf2JqJ5va /ceQ== X-Gm-Message-State: AE9vXwOedlrTJDUvPS2lH/23s95A0W0AMx6vx30HmZVjpZ79eolZTIZ02x1KZHdoTOsZRLBz+98= X-Received: by 10.25.29.6 with SMTP id d6mr14757618lfd.93.1474465145524; Wed, 21 Sep 2016 06:39:05 -0700 (PDT) Return-Path: Received: from uffe-Latitude-E6430s.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id s125sm6710569lja.14.2016.09.21.06.39.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Sep 2016 06:39:04 -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 , Jon Hunter Subject: [PATCH 4/4] PM / Domains: Rename pm_genpd_sync_poweron|poweroff() Date: Wed, 21 Sep 2016 15:38:53 +0200 Message-Id: <1474465133-14865-5-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1474465133-14865-1-git-send-email-ulf.hansson@linaro.org> References: <1474465133-14865-1-git-send-email-ulf.hansson@linaro.org> These are internal static functions to genpd. Let's conform to the naming rules, by dropping the "pm_" prefix from these. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -- 1.9.1 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index d52709e..e023066 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -617,7 +617,7 @@ static bool genpd_dev_active_wakeup(struct generic_pm_domain *genpd, } /** - * pm_genpd_sync_poweroff - Synchronously power off a PM domain and its masters. + * genpd_sync_poweroff - Synchronously power off a PM domain and its masters. * @genpd: PM domain to power off, if possible. * * Check if the given PM domain can be powered off (during system suspend or @@ -628,7 +628,7 @@ static bool genpd_dev_active_wakeup(struct generic_pm_domain *genpd, * executed sequentially, so it is guaranteed that it will never run twice in * parallel). */ -static void pm_genpd_sync_poweroff(struct generic_pm_domain *genpd) +static void genpd_sync_poweroff(struct generic_pm_domain *genpd) { struct gpd_link *link; @@ -647,12 +647,12 @@ static void pm_genpd_sync_poweroff(struct generic_pm_domain *genpd) list_for_each_entry(link, &genpd->slave_links, slave_node) { genpd_sd_counter_dec(link->master); - pm_genpd_sync_poweroff(link->master); + genpd_sync_poweroff(link->master); } } /** - * pm_genpd_sync_poweron - Synchronously power on a PM domain and its masters. + * genpd_sync_poweron - Synchronously power on a PM domain and its masters. * @genpd: PM domain to power on. * * This function is only called in "noirq" and "syscore" stages of system power @@ -660,7 +660,7 @@ static void pm_genpd_sync_poweroff(struct generic_pm_domain *genpd) * executed sequentially, so it is guaranteed that it will never run twice in * parallel). */ -static void pm_genpd_sync_poweron(struct generic_pm_domain *genpd) +static void genpd_sync_poweron(struct generic_pm_domain *genpd) { struct gpd_link *link; @@ -668,7 +668,7 @@ static void pm_genpd_sync_poweron(struct generic_pm_domain *genpd) return; list_for_each_entry(link, &genpd->slave_links, slave_node) { - pm_genpd_sync_poweron(link->master); + genpd_sync_poweron(link->master); genpd_sd_counter_inc(link->master); } @@ -784,7 +784,7 @@ static int pm_genpd_suspend_noirq(struct device *dev) * the same PM domain, so it is not necessary to use locking here. */ genpd->suspended_count++; - pm_genpd_sync_poweroff(genpd); + genpd_sync_poweroff(genpd); return 0; } @@ -814,7 +814,7 @@ static int pm_genpd_resume_noirq(struct device *dev) * guaranteed that this function will never run twice in parallel for * the same PM domain, so it is not necessary to use locking here. */ - pm_genpd_sync_poweron(genpd); + genpd_sync_poweron(genpd); genpd->suspended_count--; if (genpd->dev_ops.stop && genpd->dev_ops.start) @@ -902,12 +902,12 @@ static int pm_genpd_restore_noirq(struct device *dev) if (genpd->suspended_count++ == 0) /* * The boot kernel might put the domain into arbitrary state, - * so make it appear as powered off to pm_genpd_sync_poweron(), + * so make it appear as powered off to genpd_sync_poweron(), * so that it tries to power it on in case it was really off. */ genpd->status = GPD_STATE_POWER_OFF; - pm_genpd_sync_poweron(genpd); + genpd_sync_poweron(genpd); if (genpd->dev_ops.stop && genpd->dev_ops.start) ret = pm_runtime_force_resume(dev); @@ -962,9 +962,9 @@ static void genpd_syscore_switch(struct device *dev, bool suspend) if (suspend) { genpd->suspended_count++; - pm_genpd_sync_poweroff(genpd); + genpd_sync_poweroff(genpd); } else { - pm_genpd_sync_poweron(genpd); + genpd_sync_poweron(genpd); genpd->suspended_count--; } }