From patchwork Wed Feb 10 13:02:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 61657 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2631345lbl; Wed, 10 Feb 2016 05:07:04 -0800 (PST) X-Received: by 10.66.141.79 with SMTP id rm15mr57468855pab.77.1455109624336; Wed, 10 Feb 2016 05:07:04 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id bz9si4995327pab.187.2016.02.10.05.07.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Feb 2016 05:07:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aTUTC-0007nl-MZ; Wed, 10 Feb 2016 13:06:10 +0000 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aTUS4-0005ve-R8 for linux-arm-kernel@lists.infradead.org; Wed, 10 Feb 2016 13:05:03 +0000 Received: by mail-wm0-x22b.google.com with SMTP id 128so25911060wmz.1 for ; Wed, 10 Feb 2016 05:04:40 -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=cQvrjy2KAyP1mblPR2Z7N1sCZb5WL/+WzcUG68QDStmtSBx2wljU52lQhv4Ysapujw gA48wSTqO5FnjHaArH4ocPzLXxzJ8xrRIkvCEnWsjntwmSJ9PfHQSdZXqgfjtrKpcH67 GTAcVFT3/xmkIpgoXBrnIr0XJ6Kj2nvQYkJtA= 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=N+g7mmo08ZOG7xtS6DYjP9iIHEfJniU8L9e2NKl1ltlZVAr8Fz7T4FuAQ0AJOrMlzR v0VnF3zf+J+I0PA+41aTLqB7YWyqvQ5nx9PCS7hANVAISfACAwQRHyLseKVFQAd/SVqK q2vqI9TWCfKu6SieOfcGUzmdIYv6T/pbpA+rbVS8zOulIapA66ujbwC39TFLsxfEGSv5 0XVNBIX4JLl3yI7sXOtV8VsUiiCWmxuv9OfHDs5kEs1gLf5F/UcGhCny2LngBbjxZpQW mES5GU7iBT8NS5rKcPs+S08xP5mP+v+UV6A42lidnxY/PSeM17og/XGko0iC5pC9P7yn +eng== X-Gm-Message-State: AG10YOTdE1sPteQCwEd3N7e1kMgv9tlcAW7Bjetus7egpbUl3svM5qbA9rQCHb1hglDHXK+7 X-Received: by 10.194.240.66 with SMTP id vy2mr39986158wjc.28.1455109479204; Wed, 10 Feb 2016 05:04:39 -0800 (PST) Received: from localhost.localdomain (host81-129-170-149.range81-129.btcentralplus.com. [81.129.170.149]) by smtp.gmail.com with ESMTPSA id q75sm22429319wmd.6.2016.02.10.05.04.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Feb 2016 05:04:38 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, thierry.reding@gmail.com, linux-pwm@vger.kernel.org, ajitpal.singh@st.com Subject: [PATCH 04/11] pwm: sti: Only request clock rate when you need to Date: Wed, 10 Feb 2016 13:02:21 +0000 Message-Id: <1455109348-32767-5-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455109348-32767-1-git-send-email-lee.jones@linaro.org> References: <1455109348-32767-1-git-send-email-lee.jones@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160210_050501_192298_4D067F00 X-CRM114-Status: GOOD ( 15.04 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:22b listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lee Jones , kernel@stlinux.com, maxime.coquelin@st.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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");