From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51F9AC432C0 for ; Thu, 28 Nov 2019 17:54:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E6ED21771 for ; Thu, 28 Nov 2019 17:54:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="B4+afiQY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726616AbfK1Ryx (ORCPT ); Thu, 28 Nov 2019 12:54:53 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:47008 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726612AbfK1Ryw (ORCPT ); Thu, 28 Nov 2019 12:54:52 -0500 Received: by mail-pf1-f196.google.com with SMTP id 193so13418576pfc.13 for ; Thu, 28 Nov 2019 09:54:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=1sBGIUbzoeKJkrzm3m7VWuMuV29EAqIZE/5yemUqtvo=; b=B4+afiQYU1sigPtm6HWzCGuBooz/0YNgmERpBu5QzklsEfw/R8KQ6+/8l4jLfXW/Oe OLK/rNwW8ne9UFhzuxbenjxNavoo6s5THMbL1Pm/KxyiuamH8rLMekiwEKAt6wGrvE4V T3ssk8Q1sBwzy2da3N9uaFf1RatawWPIRS1gsq+rG7cOROJ1rYWQJR0qODECLWNx9bER qQpEyj3RCCGELlXPQHkRsl8DXh7hr4KVYofQc+EmotsURbaQ2NMQzypOUbE1+cs0tNWW wVa+LxfEULOxOgKTsmRl7Jjf1IU/NDpbK0PBeT6278vByh7rUYrFFK8GJ4Hd7p6xcDeH u2fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=1sBGIUbzoeKJkrzm3m7VWuMuV29EAqIZE/5yemUqtvo=; b=Z/wGQCkoB46zxlQw5G1mTUvXccm7MrBL4vueTbSlS+2sfl0ERStPRBQNDfGehUaRPe 7pHbIclMEzjkfzVGaSjLh1noeYYCBNemqWbPESHjEoL68aCiYFKzT/axvAKEl+NE3/iq n8iAUFIKELjRNooI08bsD4jHBqKhUnIJTO2MEyq+whtXqR4BXIAlRiZgGdP/9vrVc+0J 4XvV5qVvE3UHGyYD+Ylwpf7AdCS7R7/tQu3K2VjWUKyttlVb3QZeX9dMX5UikO9eUbqq HnfAkRrgLCVWvIrSbfNU5v+Vj/RqRyIb61TDxXP5GuT7jZsZvVZqAMqVPmCzntZh+IRY 27Wg== X-Gm-Message-State: APjAAAU4LbNDKe8+G2GbnDdk8U1i7BeVA+R9z2rnOmlJAB/IOt0PFKS8 w1AzTRReiNCUX2THwieqkKDxcw== X-Google-Smtp-Source: APXvYqzQWoG06+sWKSohKNo8/+BMuX6fv46fcHj8Lbf0L/lZw4fDWg0YWirec2tVGz9ScmDiAnH2CQ== X-Received: by 2002:a63:c802:: with SMTP id z2mr12274815pgg.158.1574963691668; Thu, 28 Nov 2019 09:54:51 -0800 (PST) Received: from yoga (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id d85sm5267829pfd.146.2019.11.28.09.54.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2019 09:54:50 -0800 (PST) Date: Thu, 28 Nov 2019 09:54:46 -0800 From: Bjorn Andersson To: Georgi Djakov Cc: linux-pm@vger.kernel.org, evgreen@chromium.org, agross@kernel.org, daidavid1@codeaurora.org, masneyb@onstation.org, sibis@codeaurora.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: Re: [PATCH 2/2] interconnect: qcom: Use the standard aggregate function Message-ID: <20191128175446.GE82109@yoga> References: <20191128134839.27606-1-georgi.djakov@linaro.org> <20191128134839.27606-2-georgi.djakov@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191128134839.27606-2-georgi.djakov@linaro.org> User-Agent: Mutt/1.12.2 (2019-09-21) Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On Thu 28 Nov 05:48 PST 2019, Georgi Djakov wrote: > Now we have a common function for standard aggregation, so let's use it, > instead of duplicating the code. > > Signed-off-by: Georgi Djakov Reviewed-by: Bjorn Andersson > --- > drivers/interconnect/qcom/msm8974.c | 15 +++------------ > drivers/interconnect/qcom/qcs404.c | 15 +++------------ > 2 files changed, 6 insertions(+), 24 deletions(-) > > diff --git a/drivers/interconnect/qcom/msm8974.c b/drivers/interconnect/qcom/msm8974.c > index 8823dce811c3..bf724c2ca02b 100644 > --- a/drivers/interconnect/qcom/msm8974.c > +++ b/drivers/interconnect/qcom/msm8974.c > @@ -550,15 +550,6 @@ static struct msm8974_icc_desc msm8974_snoc = { > .num_nodes = ARRAY_SIZE(msm8974_snoc_nodes), > }; > > -static int msm8974_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw, > - u32 peak_bw, u32 *agg_avg, u32 *agg_peak) > -{ > - *agg_avg += avg_bw; > - *agg_peak = max(*agg_peak, peak_bw); > - > - return 0; > -} > - > static void msm8974_icc_rpm_smd_send(struct device *dev, int rsc_type, > char *name, int id, u64 val) > { > @@ -603,8 +594,8 @@ static int msm8974_icc_set(struct icc_node *src, struct icc_node *dst) > qp = to_msm8974_icc_provider(provider); > > list_for_each_entry(n, &provider->nodes, node_list) > - msm8974_icc_aggregate(n, 0, n->avg_bw, n->peak_bw, > - &agg_avg, &agg_peak); > + provider->aggregate(n, 0, n->avg_bw, n->peak_bw, > + &agg_avg, &agg_peak); > > sum_bw = icc_units_to_bps(agg_avg); > max_peak_bw = icc_units_to_bps(agg_peak); > @@ -703,7 +694,7 @@ static int msm8974_icc_probe(struct platform_device *pdev) > INIT_LIST_HEAD(&provider->nodes); > provider->dev = dev; > provider->set = msm8974_icc_set; > - provider->aggregate = msm8974_icc_aggregate; > + provider->aggregate = icc_std_aggregate; > provider->xlate = of_icc_xlate_onecell; > provider->data = data; > > diff --git a/drivers/interconnect/qcom/qcs404.c b/drivers/interconnect/qcom/qcs404.c > index a4c6ba715f61..ce2e6faa3a79 100644 > --- a/drivers/interconnect/qcom/qcs404.c > +++ b/drivers/interconnect/qcom/qcs404.c > @@ -327,15 +327,6 @@ static struct qcom_icc_desc qcs404_snoc = { > .num_nodes = ARRAY_SIZE(qcs404_snoc_nodes), > }; > > -static int qcom_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw, > - u32 peak_bw, u32 *agg_avg, u32 *agg_peak) > -{ > - *agg_avg += avg_bw; > - *agg_peak = max(*agg_peak, peak_bw); > - > - return 0; > -} > - > static int qcom_icc_set(struct icc_node *src, struct icc_node *dst) > { > struct qcom_icc_provider *qp; > @@ -354,8 +345,8 @@ static int qcom_icc_set(struct icc_node *src, struct icc_node *dst) > qp = to_qcom_provider(provider); > > list_for_each_entry(n, &provider->nodes, node_list) > - qcom_icc_aggregate(n, 0, n->avg_bw, n->peak_bw, > - &agg_avg, &agg_peak); > + provider->aggregate(n, 0, n->avg_bw, n->peak_bw, > + &agg_avg, &agg_peak); > > sum_bw = icc_units_to_bps(agg_avg); > max_peak_bw = icc_units_to_bps(agg_peak); > @@ -465,7 +456,7 @@ static int qnoc_probe(struct platform_device *pdev) > INIT_LIST_HEAD(&provider->nodes); > provider->dev = dev; > provider->set = qcom_icc_set; > - provider->aggregate = qcom_icc_aggregate; > + provider->aggregate = icc_std_aggregate; > provider->xlate = of_icc_xlate_onecell; > provider->data = data; >