Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6f9c92f1b9930dd400c79872036d1d8636e6e4b9
Commit:     6f9c92f1b9930dd400c79872036d1d8636e6e4b9
Parent:     ef557d76dfbdf74c240f76be15fa90d62f1ae61f
Author:     Dirk Behme <dirk.behme_at_gmail.com>
AuthorDate: Wed Dec 6 17:13:51 2006 -0800
Committer:  Tony Lindgren <[EMAIL PROTECTED]>
CommitDate: Fri Mar 2 01:47:09 2007 -0800

    ARM: OMAP: Fix warning in clock.c
    
    Fix warning:
    
    arch/arm/mach-omap1/clock.c: In function
    'omap1_clk_enable_generic':
    arch/arm/mach-omap1/clock.c:499: warning: 'return' with no
    value, in function returning non-void
    
    Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
    Signed-off-by: Tony Lindgren <[EMAIL PROTECTED]>
---
 arch/arm/mach-omap1/clock.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index f8e1294..8aee42c 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -432,8 +432,7 @@ static int omap1_clk_enable(struct clk *clk)
                        }
 
                        if (clk->flags & CLOCK_NO_IDLE_PARENT)
-                               if (!cpu_is_omap24xx())
-                                       omap1_clk_deny_idle(clk->parent);
+                               omap1_clk_deny_idle(clk->parent);
                }
 
                ret = clk->enable(clk);
@@ -454,8 +453,7 @@ static void omap1_clk_disable(struct clk *clk)
                if (likely(clk->parent)) {
                        omap1_clk_disable(clk->parent);
                        if (clk->flags & CLOCK_NO_IDLE_PARENT)
-                               if (!cpu_is_omap24xx())
-                                       omap1_clk_allow_idle(clk->parent);
+                               omap1_clk_allow_idle(clk->parent);
                }
        }
 }
@@ -471,7 +469,7 @@ static int omap1_clk_enable_generic(struct clk *clk)
        if (unlikely(clk->enable_reg == 0)) {
                printk(KERN_ERR "clock.c: Enable for %s without enable code\n",
                       clk->name);
-               return 0;
+               return -EINVAL;
        }
 
        if (clk->flags & ENABLE_REG_32BIT) {
@@ -496,7 +494,7 @@ static int omap1_clk_enable_generic(struct clk *clk)
                }
        }
 
-       return;
+       return 0;
 }
 
 static void omap1_clk_disable_generic(struct clk *clk)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to