Kaynağa Gözat

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 <shawn.guo@freescale.com>
Shawn Guo 11 yıl önce
ebeveyn
işleme
94b5c02882
1 değiştirilmiş dosya ile 4 ekleme ve 8 silme
  1. 4 8
      arch/arm/mach-imx/clk-gate2.c

+ 4 - 8
arch/arm/mach-imx/clk-gate2.c

@@ -43,15 +43,13 @@ static int clk_gate2_enable(struct clk_hw *hw)
 	u32 reg;
 	u32 reg;
 	unsigned long flags = 0;
 	unsigned long flags = 0;
 
 
-	if (gate->lock)
-		spin_lock_irqsave(gate->lock, flags);
+	spin_lock_irqsave(gate->lock, flags);
 
 
 	reg = readl(gate->reg);
 	reg = readl(gate->reg);
 	reg |= 3 << gate->bit_idx;
 	reg |= 3 << gate->bit_idx;
 	writel(reg, gate->reg);
 	writel(reg, gate->reg);
 
 
-	if (gate->lock)
-		spin_unlock_irqrestore(gate->lock, flags);
+	spin_unlock_irqrestore(gate->lock, flags);
 
 
 	return 0;
 	return 0;
 }
 }
@@ -62,15 +60,13 @@ static void clk_gate2_disable(struct clk_hw *hw)
 	u32 reg;
 	u32 reg;
 	unsigned long flags = 0;
 	unsigned long flags = 0;
 
 
-	if (gate->lock)
-		spin_lock_irqsave(gate->lock, flags);
+	spin_lock_irqsave(gate->lock, flags);
 
 
 	reg = readl(gate->reg);
 	reg = readl(gate->reg);
 	reg &= ~(3 << gate->bit_idx);
 	reg &= ~(3 << gate->bit_idx);
 	writel(reg, gate->reg);
 	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)
 static int clk_gate2_is_enabled(struct clk_hw *hw)