From patchwork Mon Mar 2 19:24:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 45312 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f198.google.com (mail-we0-f198.google.com [74.125.82.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 043582149C for ; Mon, 2 Mar 2015 19:24:48 +0000 (UTC) Received: by wesk11 with SMTP id k11sf25271236wes.3 for ; Mon, 02 Mar 2015 11:24:47 -0800 (PST) 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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=KXUlmLMx55b7i8bY6Fd+MpIxrAGG16tg9U9YYOBarw4=; b=LYAFsUp7VAKGt0CNb1/gV+prQXThMpulQtJDvUCnQkwz2CPbH5xliZ0vpiuOaISDGr zeyynNrxNfVU4dS1W8yRXw8OQop7NEHl8PqS5c2NO9kEXr91AsCT632SUtFoJSJvZpde oRb3RYVxnI44KSzA3IppksFcol12vnzrngekDb/IcaAzOaswPLEI68N9JWv4zdbtg/X0 Eo1229yPnXvbV6bytI18lLJGeaoRSZNZHebBoavmIRWnnL8Gtpcv/oRgt04uYh7dqYwt Soz3DlDJ5pISxeb9dYBzFiWB/M64jOdkTTn1ymYghQYcoTH4XsJghev5rJqdBbgiTYVk gaFw== X-Gm-Message-State: ALoCoQkhafjlaEjT+BHco9DZVQfGVpZny1d5EG3Onqg2QHljGwNAqKIfVToKmT2Og+eRYCRgcFU8 X-Received: by 10.194.161.194 with SMTP id xu2mr4032513wjb.1.1425324287315; Mon, 02 Mar 2015 11:24:47 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.227 with SMTP id b3ls408264lak.58.gmail; Mon, 02 Mar 2015 11:24:47 -0800 (PST) X-Received: by 10.152.36.167 with SMTP id r7mr23061795laj.7.1425324287085; Mon, 02 Mar 2015 11:24:47 -0800 (PST) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id i6si9558267laf.48.2015.03.02.11.24.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Mar 2015 11:24:47 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbvn10 with SMTP id n10so32303962lbv.4 for ; Mon, 02 Mar 2015 11:24:47 -0800 (PST) X-Received: by 10.152.26.201 with SMTP id n9mr8160249lag.29.1425324286946; Mon, 02 Mar 2015 11:24:46 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp109089lbj; Mon, 2 Mar 2015 11:24:46 -0800 (PST) X-Received: by 10.68.110.132 with SMTP id ia4mr49042881pbb.95.1425324285041; Mon, 02 Mar 2015 11:24:45 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a4si17660194pbu.90.2015.03.02.11.24.44; Mon, 02 Mar 2015 11:24:45 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754743AbbCBTYd (ORCPT + 28 others); Mon, 2 Mar 2015 14:24:33 -0500 Received: from mail.kernel.org ([198.145.29.136]:47279 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754037AbbCBTYb (ORCPT ); Mon, 2 Mar 2015 14:24:31 -0500 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D4DE120212; Mon, 2 Mar 2015 19:24:29 +0000 (UTC) Received: from localhost (c-67-160-101-93.hsd1.wa.comcast.net [67.160.101.93]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 27082201FA; Mon, 2 Mar 2015 19:24:29 +0000 (UTC) From: Kevin Hilman To: "Rafael J. Wysocki" , linux-pm@vger.kernel.org Cc: Maciej Matraszek , Ulf Hansson , Len Brown , Pavel Machek , Greg Kroah-Hartman , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] PM / Domains: cleanup: rename gpd -> genpd in debugfs interface Date: Mon, 2 Mar 2015 11:24:28 -0800 Message-Id: <1425324268-16090-1-git-send-email-khilman@kernel.org> X-Mailer: git-send-email 2.1.3 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=ham 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.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.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Kevin Hilman To keep consisitency with the rest of the file, use 'genpd' as the name of the 'struct generic_pm_domain' pointer instead of 'gpd'. This is just a rename, no functional changes. Signed-off-by: Kevin Hilman Reviewed-by: Ulf Hansson --- drivers/base/power/domain.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index ba4abbe4693c..45937f88e77c 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -2242,7 +2242,7 @@ static void rtpm_status_str(struct seq_file *s, struct device *dev) } static int pm_genpd_summary_one(struct seq_file *s, - struct generic_pm_domain *gpd) + struct generic_pm_domain *genpd) { static const char * const status_lookup[] = { [GPD_STATE_ACTIVE] = "on", @@ -2256,26 +2256,26 @@ static int pm_genpd_summary_one(struct seq_file *s, struct gpd_link *link; int ret; - ret = mutex_lock_interruptible(&gpd->lock); + ret = mutex_lock_interruptible(&genpd->lock); if (ret) return -ERESTARTSYS; - if (WARN_ON(gpd->status >= ARRAY_SIZE(status_lookup))) + if (WARN_ON(genpd->status >= ARRAY_SIZE(status_lookup))) goto exit; - seq_printf(s, "%-30s %-15s ", gpd->name, status_lookup[gpd->status]); + seq_printf(s, "%-30s %-15s ", genpd->name, status_lookup[genpd->status]); /* * Modifications on the list require holding locks on both * master and slave, so we are safe. - * Also gpd->name is immutable. + * Also genpd->name is immutable. */ - list_for_each_entry(link, &gpd->master_links, master_node) { + list_for_each_entry(link, &genpd->master_links, master_node) { seq_printf(s, "%s", link->slave->name); - if (!list_is_last(&link->master_node, &gpd->master_links)) + if (!list_is_last(&link->master_node, &genpd->master_links)) seq_puts(s, ", "); } - list_for_each_entry(pm_data, &gpd->dev_list, list_node) { + list_for_each_entry(pm_data, &genpd->dev_list, list_node) { kobj_path = kobject_get_path(&pm_data->dev->kobj, GFP_KERNEL); if (kobj_path == NULL) continue; @@ -2287,14 +2287,14 @@ static int pm_genpd_summary_one(struct seq_file *s, seq_puts(s, "\n"); exit: - mutex_unlock(&gpd->lock); + mutex_unlock(&genpd->lock); return 0; } static int pm_genpd_summary_show(struct seq_file *s, void *data) { - struct generic_pm_domain *gpd; + struct generic_pm_domain *genpd; int ret = 0; seq_puts(s, " domain status slaves\n"); @@ -2305,8 +2305,8 @@ static int pm_genpd_summary_show(struct seq_file *s, void *data) if (ret) return -ERESTARTSYS; - list_for_each_entry(gpd, &gpd_list, gpd_list_node) { - ret = pm_genpd_summary_one(s, gpd); + list_for_each_entry(genpd, &gpd_list, gpd_list_node) { + ret = pm_genpd_summary_one(s, genpd); if (ret) break; }