From 4b14420a6b4d4edd6a600a38bb0192f6fa177791 Mon Sep 17 00:00:00 2001 From: Paul Parsons Date: Tue, 9 Aug 2011 16:27:43 +0000 Subject: [PATCH] --- yaml --- r: 273369 b: refs/heads/master c: c29a81270bd3cbdf0c603d42f4c2d17acf94a0bc h: refs/heads/master i: 273367: 61afb577b049c0038d8d9acb2d2d14a38f867f64 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/asic3.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8e6a0c9861d3..fb4dd5a122ac 100644 --- 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 index 2dbb8ca89730..3da3a901ec3e 100644 --- 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)