From patchwork Tue Oct 4 11:56:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 77253 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp2173655qgf; Tue, 4 Oct 2016 04:57:46 -0700 (PDT) X-Received: by 10.66.192.134 with SMTP id hg6mr4503417pac.64.1475582265999; Tue, 04 Oct 2016 04:57:45 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l8si42358172pfi.252.2016.10.04.04.57.45; Tue, 04 Oct 2016 04:57:45 -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; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753892AbcJDL5T (ORCPT + 27 others); Tue, 4 Oct 2016 07:57:19 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:34905 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753821AbcJDL5R (ORCPT ); Tue, 4 Oct 2016 07:57:17 -0400 Received: by mail-pf0-f175.google.com with SMTP id s13so75223036pfd.2 for ; Tue, 04 Oct 2016 04:57:16 -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 :in-reply-to:references; bh=Ta0fx284D6ZcAYu5CuqrnLK2e+oSyG8U1y04SdoEM4M=; b=HLRwSuHoO26MFjwCBIGN8a26WG0jDugOp/NjQM/bwqIXg3nlZtF12svfK2l5FWMXEV NOt7yCmWKJvvrxMd5RUvKMw4x8fRbkbQS8NApeWu/wzDM3/46OdPWNtgAx/WnwnReKB4 UQb70Y/tHyrdeXgbloZwqg/60eWDXf8zOc4yw= 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:in-reply-to:references; bh=Ta0fx284D6ZcAYu5CuqrnLK2e+oSyG8U1y04SdoEM4M=; b=Gq7NcgahaubBb8i9HOIilJW4bJ3QejoSHu30Sz+Mx3W/XNQovHpw+sAM76nmpt4De8 13XDKE9DegBM0+H0fbECV63788NrGR4qOKwNZ9BguArHOEU24L+PIU0IQKems2Jg0yfc NfDr7oYsZUMRB4ySQgt1rP3RKlAoZmP2UE2MlZSVHCGai+hkiHO6wle8MJFPfCsi6SfZ w3FyQmYUObqVXMmAPMAR1b5xna2pfj5FmEFS815ccss/D7UKFfa8HOfdJbPwLuihHx/E 8xzO1fAgNBf8Y3IvhMls/wOU5v537q42mN8XEf7MyQcUgIgh0UMIwLr8ukJ6SdoI9GAV WBkw== X-Gm-Message-State: AA6/9RnIHHMog5R1mkKej4UO7kl7nNt9Xmc9jaywFkgnkdb7JeGw5OP1izlEEPSTgB92DC7n X-Received: by 10.98.34.212 with SMTP id p81mr5472987pfj.18.1475582236366; Tue, 04 Oct 2016 04:57:16 -0700 (PDT) Received: from localhost ([122.171.115.29]) by smtp.gmail.com with ESMTPSA id c145sm54774983pfb.15.2016.10.04.04.57.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Oct 2016 04:57:15 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , nm@ti.com, sboyd@codeaurora.org, Viresh Kumar Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Vincent Guittot , robh@kernel.org, d-gerlach@ti.com, broonie@kernel.org, Viresh Kumar Subject: [PATCH 4/8] PM / OPP: Pass struct dev_pm_opp_supply to _set_opp_voltage() Date: Tue, 4 Oct 2016 17:26:46 +0530 Message-Id: <0867f43f994548962a9b39703829a4adc3dc57a3.1475581665.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.7.1.410.g6faf27b In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Pass the entire supply structure instead of all of its fields. Signed-off-by: Viresh Kumar --- drivers/base/power/opp/core.c | 44 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) -- 2.7.1.410.g6faf27b diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c index 8d6006151c9a..37fad2eb0f47 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -542,8 +542,7 @@ static struct clk *_get_opp_clk(struct device *dev) } static int _set_opp_voltage(struct device *dev, struct regulator *reg, - unsigned long u_volt, unsigned long u_volt_min, - unsigned long u_volt_max) + struct dev_pm_opp_supply *supply) { int ret; @@ -554,14 +553,15 @@ static int _set_opp_voltage(struct device *dev, struct regulator *reg, return 0; } - dev_dbg(dev, "%s: voltages (mV): %lu %lu %lu\n", __func__, u_volt_min, - u_volt, u_volt_max); + dev_dbg(dev, "%s: voltages (mV): %lu %lu %lu\n", __func__, + supply->u_volt_min, supply->u_volt, supply->u_volt_max); - ret = regulator_set_voltage_triplet(reg, u_volt_min, u_volt, - u_volt_max); + ret = regulator_set_voltage_triplet(reg, supply->u_volt_min, + supply->u_volt, supply->u_volt_max); if (ret) dev_err(dev, "%s: failed to set voltage (%lu %lu %lu mV): %d\n", - __func__, u_volt_min, u_volt, u_volt_max, ret); + __func__, supply->u_volt_min, supply->u_volt, + supply->u_volt_max, ret); return ret; } @@ -583,8 +583,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) struct regulator *reg; struct clk *clk; unsigned long freq, old_freq; - unsigned long u_volt, u_volt_min, u_volt_max; - unsigned long old_u_volt, old_u_volt_min, old_u_volt_max; + struct dev_pm_opp_supply old_supply, new_supply; int ret; if (unlikely(!target_freq)) { @@ -634,17 +633,12 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) return ret; } - if (IS_ERR(old_opp)) { - old_u_volt = 0; - } else { - old_u_volt = old_opp->supply.u_volt; - old_u_volt_min = old_opp->supply.u_volt_min; - old_u_volt_max = old_opp->supply.u_volt_max; - } + if (IS_ERR(old_opp)) + old_supply.u_volt = 0; + else + memcpy(&old_supply, &old_opp->supply, sizeof(old_supply)); - u_volt = opp->supply.u_volt; - u_volt_min = opp->supply.u_volt_min; - u_volt_max = opp->supply.u_volt_max; + memcpy(&new_supply, &opp->supply, sizeof(new_supply)); reg = opp_table->regulator; @@ -652,8 +646,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) /* Scaling up? Scale voltage before frequency */ if (freq > old_freq) { - ret = _set_opp_voltage(dev, reg, u_volt, u_volt_min, - u_volt_max); + ret = _set_opp_voltage(dev, reg, &new_supply); if (ret) goto restore_voltage; } @@ -672,8 +665,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) /* Scaling down? Scale voltage after frequency */ if (freq < old_freq) { - ret = _set_opp_voltage(dev, reg, u_volt, u_volt_min, - u_volt_max); + ret = _set_opp_voltage(dev, reg, &new_supply); if (ret) goto restore_freq; } @@ -686,10 +678,8 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) __func__, old_freq); restore_voltage: /* This shouldn't harm even if the voltages weren't updated earlier */ - if (old_u_volt) { - _set_opp_voltage(dev, reg, old_u_volt, old_u_volt_min, - old_u_volt_max); - } + if (old_supply.u_volt) + _set_opp_voltage(dev, reg, &old_supply); return ret; }