From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Stephen Boyd <sboyd@codeaurora.org>,
linux-kernel@vger.kernel.org, heikki.krogerus@linux.intel.com
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 2/2] clk: fractional-divider: fix sparse warnings
Date: Mon, 30 Mar 2015 21:57:49 +0300 [thread overview]
Message-ID: <1427741869-239562-3-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1427741869-239562-1-git-send-email-andriy.shevchenko@linux.intel.com>
Sparse complains about possible imbalance in locking.
drivers/clk/clk-fractional-divider.c:37:9: warning: context imbalance in 'clk_fd_recalc_rate' - different lock contexts for basic block
drivers/clk/clk-fractional-divider.c:61:12: warning: context imbalance in 'clk_fd_set_rate' - different lock contexts for basic block
Let's rewrite code to fix this and make it more straight.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/clk/clk-fractional-divider.c | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
diff --git a/drivers/clk/clk-fractional-divider.c b/drivers/clk/clk-fractional-divider.c
index 9c53704..3766da8 100644
--- a/drivers/clk/clk-fractional-divider.c
+++ b/drivers/clk/clk-fractional-divider.c
@@ -26,13 +26,13 @@ static unsigned long clk_fd_recalc_rate(struct clk_hw *hw,
unsigned long flags = 0;
u32 val;
- if (fd->lock)
+ if (fd->lock) {
spin_lock_irqsave(fd->lock, flags);
-
- val = clk_readl(fd->reg);
-
- if (fd->lock)
+ val = clk_readl(fd->reg);
spin_unlock_irqrestore(fd->lock, flags);
+ } else {
+ val = clk_readl(fd->reg);
+ }
m = (val & fd->mmask) >> fd->mshift;
n = (val & fd->nmask) >> fd->nshift;
@@ -58,27 +58,34 @@ static long clk_fd_round_rate(struct clk_hw *hw, unsigned long rate,
return mult_frac(rate, m, n);
}
+static void clk_fd_update(struct clk_fractional_divider *fd,
+ unsigned long m, unsigned long n)
+{
+ u32 val;
+
+ val = clk_readl(fd->reg);
+ val &= ~(fd->mmask | fd->nmask);
+ val |= (m << fd->mshift) | (n << fd->nshift);
+ clk_writel(val, fd->reg);
+}
+
static int clk_fd_set_rate(struct clk_hw *hw, unsigned long rate,
unsigned long parent_rate)
{
struct clk_fractional_divider *fd = to_clk_fd(hw);
unsigned long flags = 0;
unsigned long n, m;
- u32 val;
rational_best_approximation(rate, parent_rate,
fd->mmask >> fd->mshift, fd->nmask >> fd->nshift, &m, &n);
- if (fd->lock)
+ if (fd->lock) {
spin_lock_irqsave(fd->lock, flags);
-
- val = clk_readl(fd->reg);
- val &= ~(fd->mmask | fd->nmask);
- val |= (m << fd->mshift) | (n << fd->nshift);
- clk_writel(val, fd->reg);
-
- if (fd->lock)
+ clk_fd_update(fd, m, n);
spin_unlock_irqrestore(fd->lock, flags);
+ } else {
+ clk_fd_update(fd, m, n);
+ }
return 0;
}
--
2.1.4
prev parent reply other threads:[~2015-03-30 18:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-30 18:57 [PATCH v2 0/2] clk: fractional-divider: do a clean up Andy Shevchenko
2015-03-30 18:57 ` [PATCH v2 1/2] clk: fractional-divider: switch to rational best approximation Andy Shevchenko
2015-03-31 0:32 ` Stephen Boyd
2015-03-31 7:42 ` Andy Shevchenko
2015-03-31 9:33 ` Andy Shevchenko
2015-03-30 18:57 ` Andy Shevchenko [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427741869-239562-3-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sboyd@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).