From patchwork Thu Oct 15 16:12:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 55055 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lf0-f71.google.com (mail-lf0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id 10ADA22FFA for ; Thu, 15 Oct 2015 16:13:30 +0000 (UTC) Received: by lffy185 with SMTP id y185sf4885300lff.2 for ; Thu, 15 Oct 2015 09:13:29 -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=V7hNZEqW1sqqfmSN7TJii0b7uy0JzR5qw/lsGzrWUec=; b=X6IaujYqd1q3jzAYEE0B8ycF/Mn1DMTMn1o2B6C3D2cNPS6pOWMQhUPAE/LbKBp9z/ s+1/yJAexluG40a6J7p365cWzkl4i3wkRKLv7tJDZ+Lhfcn39FO4T99aNkt4+S8y4UbP ILL1I9S0cCovDVUvqTvsrEkVNbqX4VD6TuStxet2+expH1LmG23DluPPZ6ue/Tr2xVvx 1W/4bryactPfFoMocVvVUn0/TkMLukBUWQ8iVNrVVUfY8nf1B/Swh8/s61aeeVA3H3yu ZZm8Wd9AJ1RfiI4J1anJO/gDZkyPnAcetKrEjAgk0QsyIFeBG1gN24yvTJYIuB/Wl2Pu JZdw== X-Gm-Message-State: ALoCoQkv3lcReYsz//XuKNTqw5Jh63gg6aZ22K4GrLgm5nLpspYzheCk70lmsxnJyOyV8rOwQsiH X-Received: by 10.112.209.73 with SMTP id mk9mr2359023lbc.14.1444925609024; Thu, 15 Oct 2015 09:13:29 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.28.195 with SMTP id c186ls57904lfc.71.gmail; Thu, 15 Oct 2015 09:13:28 -0700 (PDT) X-Received: by 10.25.19.97 with SMTP id j94mr3396041lfi.106.1444925608890; Thu, 15 Oct 2015 09:13:28 -0700 (PDT) Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id mz10si9590721lbb.122.2015.10.15.09.13.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Oct 2015 09:13:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lfaz124 with SMTP id z124so34584352lfa.1 for ; Thu, 15 Oct 2015 09:13:28 -0700 (PDT) X-Received: by 10.25.86.213 with SMTP id k204mr3329621lfb.36.1444925608300; Thu, 15 Oct 2015 09:13:28 -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 w3csp726295lbq; Thu, 15 Oct 2015 09:13:27 -0700 (PDT) X-Received: by 10.50.171.194 with SMTP id aw2mr6767679igc.83.1444925607324; Thu, 15 Oct 2015 09:13:27 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e97si2733828ioj.6.2015.10.15.09.13.26; Thu, 15 Oct 2015 09:13:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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 S1752659AbbJOQNX (ORCPT + 12 others); Thu, 15 Oct 2015 12:13:23 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:32978 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753320AbbJOQNW (ORCPT ); Thu, 15 Oct 2015 12:13:22 -0400 Received: by pabrc13 with SMTP id rc13so91894040pab.0 for ; Thu, 15 Oct 2015 09:13:22 -0700 (PDT) X-Received: by 10.68.69.79 with SMTP id c15mr10823531pbu.90.1444925601989; Thu, 15 Oct 2015 09:13:21 -0700 (PDT) Received: from localhost ([223.227.130.246]) by smtp.gmail.com with ESMTPSA id sv9sm16230391pbc.44.2015.10.15.09.13.20 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 15 Oct 2015 09:13:21 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, sboyd@codeaurora.org, nm@ti.com, Viresh Kumar , Bartlomiej Zolnierkiewicz , Dmitry Torokhov , Greg Kroah-Hartman , Len Brown , linux-kernel@vger.kernel.org (open list), Pavel Machek Subject: [PATCH V2 2/4] PM / OPP: Rename routines specific to old bindings with _v1 Date: Thu, 15 Oct 2015 21:42:44 +0530 Message-Id: <3d59c93aa8107f96b659dd5e774596c5a396a9d8.1444925400.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@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.44 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 a422ebf2501f..63b0f57601b8 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -703,7 +703,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 @@ -729,8 +729,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; @@ -941,7 +941,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); @@ -1243,7 +1243,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;