---

yaml --- r: 273369 b: refs/heads/master c: c29a812 h: refs/heads/master i: 273367: 61afb57 v: v3
git-mirror · Oct 24, 2011 · 4b14420 · 4b14420
1 parent 62ceeb4
commit 4b14420
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0b13b5b6a9ad3ccadaa6662524a92e13aa7a032
+refs/heads/master: c29a81270bd3cbdf0c603d42f4c2d17acf94a0bc
diff --git a/trunk/drivers/mfd/asic3.c b/trunk/drivers/mfd/asic3.c
@@ -584,7 +584,7 @@ static int asic3_gpio_remove(struct platform_device *pdev)
 	return gpiochip_remove(&asic->gpio);
 }
 
-static int asic3_clk_enable(struct asic3 *asic, struct asic3_clk *clk)
+static void asic3_clk_enable(struct asic3 *asic, struct asic3_clk *clk)
 {
 	unsigned long flags;
 	u32 cdex;
@@ -596,8 +596,6 @@ static int asic3_clk_enable(struct asic3 *asic, struct asic3_clk *clk)
 		asic3_write_register(asic, ASIC3_OFFSET(CLOCK, CDEX), cdex);
 	}
 	spin_unlock_irqrestore(&asic->lock, flags);
-
-	return 0;
 }
 
 static void asic3_clk_disable(struct asic3 *asic, struct asic3_clk *clk)