From patchwork Fri Sep 11 12:02:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 53452 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id A058B215BF for ; Fri, 11 Sep 2015 12:03:01 +0000 (UTC) Received: by wicmn1 with SMTP id mn1sf17696950wic.1 for ; Fri, 11 Sep 2015 05:03:01 -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:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=2vF2wM4x80yfs7TUQBAg2OPQndYyM5855VoVn/AcdlQ=; b=DiYOHznN0o37IkUXePplWrcPqn34dAmZ52+ly4I/twXoApY2CfluH5FOqn629hTfVD laNSMc4/7/Mn0XVrEPy7yT+j8Iu8Y5Y1ytzMtuRBgoZt8zyIaIImS/bYYCI9NkqIb+rJ X8z67D0JAw74CXBXlYsBPaz1cBU1l31IVRLgxDRO6hBX6IJqM1HkwNHdCZ660zToNbGL jg3I58a7g5vkENhq+InpiSi4Q45j+24CLuphaT+Up4OoxKU/OUkMzu68cCJrM5JRKhtJ /xwiBrVpEqXtDsBkk+cnszMrLWyDwRDrcdlkMB3KbNZ14N8DLprf38KfIiSTMNvnvBjU 5k4A== X-Gm-Message-State: ALoCoQlAL6z0KekH4cFY6XVFX2rQdKuBSdGR+tucI9PvE4iHye2j/LMalPWSUL91qSASbjYdxtS7 X-Received: by 10.152.29.36 with SMTP id g4mr11225318lah.3.1441972980911; Fri, 11 Sep 2015 05:03:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.18.167 with SMTP id x7ls346688lad.53.gmail; Fri, 11 Sep 2015 05:03:00 -0700 (PDT) X-Received: by 10.112.156.69 with SMTP id wc5mr37152684lbb.53.1441972980736; Fri, 11 Sep 2015 05:03:00 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id wh4si14543lbb.91.2015.09.11.05.03.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Sep 2015 05:03:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by lahg1 with SMTP id g1so16299868lah.1 for ; Fri, 11 Sep 2015 05:03:00 -0700 (PDT) X-Received: by 10.152.21.196 with SMTP id x4mr41120032lae.117.1441972980594; Fri, 11 Sep 2015 05:03:00 -0700 (PDT) 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.59.35 with SMTP id w3csp1544973lbq; Fri, 11 Sep 2015 05:02:59 -0700 (PDT) X-Received: by 10.107.167.199 with SMTP id q190mr3402007ioe.119.1441972979325; Fri, 11 Sep 2015 05:02:59 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id mf6si246659igb.0.2015.09.11.05.02.57; Fri, 11 Sep 2015 05:02:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752990AbbIKMCt (ORCPT + 28 others); Fri, 11 Sep 2015 08:02:49 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:35270 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752929AbbIKMCq (ORCPT ); Fri, 11 Sep 2015 08:02:46 -0400 Received: by pacfv12 with SMTP id fv12so74990968pac.2 for ; Fri, 11 Sep 2015 05:02:46 -0700 (PDT) X-Received: by 10.67.4.230 with SMTP id ch6mr22896922pad.11.1441972966023; Fri, 11 Sep 2015 05:02:46 -0700 (PDT) Received: from localhost ([122.171.186.190]) by smtp.gmail.com with ESMTPSA id bh5sm86398pbc.5.2015.09.11.05.02.45 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 11 Sep 2015 05:02:45 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , nm@ti.com, sboyd@codeaurora.org Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, rob.herring@linaro.org, lee.jones@linaro.org, Viresh Kumar , Bartlomiej Zolnierkiewicz , Dmitry Torokhov , Greg Kroah-Hartman , Len Brown , linux-kernel@vger.kernel.org (open list), Pavel Machek Subject: [PATCH 04/16] PM / OPP: Rename routines specific to old bindings with _v1 Date: Fri, 11 Sep 2015 17:32:00 +0530 Message-Id: X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: 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: viresh.kumar@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.52 as permitted sender) smtp.mailfrom=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: , Clearly distinguish routines based on what version of bindings they parse. We have already postfixed routines properly with _v2 for new bindings. Postfix the older ones now with _v1. Signed-off-by: Viresh Kumar --- drivers/base/power/opp/core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c index 113fdd0ce6d9..6bebc503d727 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -718,7 +718,7 @@ static int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, } /** - * _opp_add_dynamic() - Allocate a dynamic OPP. + * _opp_add_v1() - Allocate a OPP based on v1 bindings. * @dev: device for which we do this operation * @freq: Frequency in Hz for this OPP * @u_volt: Voltage in uVolts for this OPP @@ -744,8 +744,8 @@ static int _opp_add(struct device *dev, struct dev_pm_opp *new_opp, * Duplicate OPPs (both freq and volt are same) and !opp->available * -ENOMEM Memory allocation failure */ -static int _opp_add_dynamic(struct device *dev, unsigned long freq, - long u_volt, bool dynamic) +static int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt, + bool dynamic) { struct device_opp *dev_opp; struct dev_pm_opp *new_opp; @@ -949,7 +949,7 @@ static int _opp_add_static_v2(struct device *dev, struct device_node *np) */ int dev_pm_opp_add(struct device *dev, unsigned long freq, unsigned long u_volt) { - return _opp_add_dynamic(dev, freq, u_volt, true); + return _opp_add_v1(dev, freq, u_volt, true); } EXPORT_SYMBOL_GPL(dev_pm_opp_add); @@ -1251,7 +1251,7 @@ static int _of_add_opp_table_v1(struct device *dev) unsigned long freq = be32_to_cpup(val++) * 1000; unsigned long volt = be32_to_cpup(val++); - if (_opp_add_dynamic(dev, freq, volt, false)) + if (_opp_add_v1(dev, freq, volt, false)) dev_warn(dev, "%s: Failed to add OPP %ld\n", __func__, freq); nr -= 2;