diff options
author | Jonas Gorski <jonas.gorski@gmail.com> | 2019-04-18 13:12:11 +0200 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2019-04-23 19:57:49 +0200 |
commit | 5834fd75e6236605da8c439a64eaa33f3c8d02fe (patch) | |
tree | 2ff613d31f59604f24eb0734aa4f391d727a34af /drivers/clk/rockchip/clk-half-divider.c | |
parent | clk: core: remove powerpc special handling (diff) | |
download | linux-5834fd75e6236605da8c439a64eaa33f3c8d02fe.tar.xz linux-5834fd75e6236605da8c439a64eaa33f3c8d02fe.zip |
clk: core: replace clk_{readl,writel} with {readl,writel}
Now that clk_{readl,writel} is just an alias for {readl,writel}, we can
switch all users of clk_* to use the accessors directly and remove the
helpers.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
[sboyd@kernel.org: Also convert renesas file so that this can be
compile independently]
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'drivers/clk/rockchip/clk-half-divider.c')
-rw-r--r-- | drivers/clk/rockchip/clk-half-divider.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/rockchip/clk-half-divider.c b/drivers/clk/rockchip/clk-half-divider.c index b8da6e799423..784b81e1ea7c 100644 --- a/drivers/clk/rockchip/clk-half-divider.c +++ b/drivers/clk/rockchip/clk-half-divider.c @@ -24,7 +24,7 @@ static unsigned long clk_half_divider_recalc_rate(struct clk_hw *hw, struct clk_divider *divider = to_clk_divider(hw); unsigned int val; - val = clk_readl(divider->reg) >> divider->shift; + val = readl(divider->reg) >> divider->shift; val &= div_mask(divider->width); val = val * 2 + 3; @@ -124,11 +124,11 @@ static int clk_half_divider_set_rate(struct clk_hw *hw, unsigned long rate, if (divider->flags & CLK_DIVIDER_HIWORD_MASK) { val = div_mask(divider->width) << (divider->shift + 16); } else { - val = clk_readl(divider->reg); + val = readl(divider->reg); val &= ~(div_mask(divider->width) << divider->shift); } val |= value << divider->shift; - clk_writel(val, divider->reg); + writel(val, divider->reg); if (divider->lock) spin_unlock_irqrestore(divider->lock, flags); |