From patchwork Wed Mar 2 15:32:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 63395 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2449093lbc; Wed, 2 Mar 2016 07:36:22 -0800 (PST) X-Received: by 10.98.68.91 with SMTP id r88mr17975994pfa.12.1456932982795; Wed, 02 Mar 2016 07:36:22 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tr8si40031000pab.0.2016.03.02.07.36.22; Wed, 02 Mar 2016 07:36:22 -0800 (PST) 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; 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; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754955AbcCBPeW (ORCPT + 30 others); Wed, 2 Mar 2016 10:34:22 -0500 Received: from mail-wm0-f42.google.com ([74.125.82.42]:35611 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753225AbcCBPeT (ORCPT ); Wed, 2 Mar 2016 10:34:19 -0500 Received: by mail-wm0-f42.google.com with SMTP id l68so91153831wml.0 for ; Wed, 02 Mar 2016 07:34:18 -0800 (PST) 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; bh=SZtDauQNC1SMdtfO9bNskbO4DzcclMvG7h9Oda36xFc=; b=Ud3tGNDjO3AGlj7zJfWsjm0IJmE+eEmBjESwVIEbpwcvI8lpW0/ydy8N6LCkMPJTp6 /bgFQnjqKc1uem2MJNM8c/DC67CHOKdIx/K+ix4BsKJ2UbLPz5kUqQjsjw1PN5x/2AOb NmKSO9WEgCWNFbtWxxxcc4l8yRdwnqk1ywMsg= 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; bh=SZtDauQNC1SMdtfO9bNskbO4DzcclMvG7h9Oda36xFc=; b=Mxsm4NVhybng5eT9mygdd5YP+ccoQtU0T/9gz+BDpyYBWbfJrcfQiM/Jvh0yPp1xXu 2iXEXe/qDykPNZrmN5hqfSYL/jpG/2+KTQc5/QotS0HRXwTWx5TppmmmohHa5MGzGf/S B611WuG4Ue8Oi2RJXDUun5KFord/OchhCVKa5k8Vj/PHTztHgweNJ1eDlglbBYh67vMU zZuBw2VD8nvQJJu/TKeTF7VzE9msGRd3D/L+e/8+yh180NrMpSlnc4At7i7q1thrh6by 9/AiItnegr9uY+7hvYhPjeYuCxU8/8VMlR89VgHDJJ9zRbR+VtwVMPmApuwVrreR8xNV WdSw== X-Gm-Message-State: AD7BkJLWDZVSRHw3TfOydaPNZlb6+xyOOpQrBihB8kBTTfbk6VmswFo79QvEqfjMC1mXSd/s X-Received: by 10.194.112.98 with SMTP id ip2mr26949730wjb.24.1456932858017; Wed, 02 Mar 2016 07:34:18 -0800 (PST) Received: from localhost.localdomain (host81-154-142-245.range81-154.btcentralplus.com. [81.154.142.245]) by smtp.gmail.com with ESMTPSA id da6sm26941407wjb.24.2016.03.02.07.34.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Mar 2016 07:34:17 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, maxime.coquelin@st.com, thierry.reding@gmail.com, linux-pwm@vger.kernel.org, ajitpal.singh@st.com, Lee Jones Subject: [RESEND 04/11] pwm: sti: Only request clock rate when you need to Date: Wed, 2 Mar 2016 15:32:02 +0000 Message-Id: <1456932729-9667-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456932729-9667-1-git-send-email-lee.jones@linaro.org> References: <1456932729-9667-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the original code the clock rate was only obtained during initialisation; however, the rate may change between then and its use. This patch ensures the correct rate is acquired just before use. Signed-off-by: Lee Jones --- drivers/pwm/pwm-sti.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 1.9.1 diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c index 4e06c4d..aa217e2 100644 --- a/drivers/pwm/pwm-sti.c +++ b/drivers/pwm/pwm-sti.c @@ -51,7 +51,6 @@ struct sti_pwm_compat_data { struct sti_pwm_chip { struct device *dev; - unsigned long clk_rate; struct clk *pwm_clk; struct regmap *regmap; struct sti_pwm_compat_data *cdata; @@ -86,13 +85,20 @@ static int sti_pwm_get_prescale(struct sti_pwm_chip *pc, unsigned long period, unsigned int *prescale) { struct sti_pwm_compat_data *cdata = pc->cdata; + unsigned long clk_rate; unsigned long val; unsigned int ps; + clk_rate = clk_get_rate(pc->pwm_clk); + if (!clk_rate) { + dev_err(pc->dev, "failed to get clock rate\n"); + return -EINVAL; + } + /* * prescale = ((period_ns * clk_rate) / (10^9 * (max_pwm_count + 1)) - 1 */ - val = NSEC_PER_SEC / pc->clk_rate; + val = NSEC_PER_SEC / clk_rate; val *= cdata->max_pwm_cnt + 1; if (period % val) { @@ -353,12 +359,6 @@ static int sti_pwm_probe(struct platform_device *pdev) return PTR_ERR(pc->pwm_clk); } - pc->clk_rate = clk_get_rate(pc->pwm_clk); - if (!pc->clk_rate) { - dev_err(dev, "failed to get clock rate\n"); - return -EINVAL; - } - ret = clk_prepare(pc->pwm_clk); if (ret) { dev_err(dev, "failed to prepare clock\n");