From: Shawn Guo Date: Fri, 18 Apr 2014 08:07:44 +0000 (+0800) Subject: ARM: imx: lock is always valid for clk_gate2 X-Git-Tag: firefly_0821_release~176^2~3781^2~10^2~16 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=94b5c0288299c7b962a7e2cb734293b77b96cffe;p=firefly-linux-kernel-4.4.55.git ARM: imx: lock is always valid for clk_gate2 The imx specific clk_gate2 always has a valid lock with the clock. So the validation on gate->lock is not really needed. Remove it. Signed-off-by: Shawn Guo --- diff --git a/arch/arm/mach-imx/clk-gate2.c b/arch/arm/mach-imx/clk-gate2.c index 7e98ccb8fa91..0803df9d9c7e 100644 --- a/arch/arm/mach-imx/clk-gate2.c +++ b/arch/arm/mach-imx/clk-gate2.c @@ -43,15 +43,13 @@ static int clk_gate2_enable(struct clk_hw *hw) u32 reg; unsigned long flags = 0; - if (gate->lock) - spin_lock_irqsave(gate->lock, flags); + spin_lock_irqsave(gate->lock, flags); reg = readl(gate->reg); reg |= 3 << gate->bit_idx; writel(reg, gate->reg); - if (gate->lock) - spin_unlock_irqrestore(gate->lock, flags); + spin_unlock_irqrestore(gate->lock, flags); return 0; } @@ -62,15 +60,13 @@ static void clk_gate2_disable(struct clk_hw *hw) u32 reg; unsigned long flags = 0; - if (gate->lock) - spin_lock_irqsave(gate->lock, flags); + spin_lock_irqsave(gate->lock, flags); reg = readl(gate->reg); reg &= ~(3 << gate->bit_idx); writel(reg, gate->reg); - if (gate->lock) - spin_unlock_irqrestore(gate->lock, flags); + spin_unlock_irqrestore(gate->lock, flags); } static int clk_gate2_is_enabled(struct clk_hw *hw)