[ARM] omap: provide a standard clk_get_parent() implementation
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 8 Feb 2009 17:49:22 +0000 (17:49 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 8 Feb 2009 17:49:22 +0000 (17:49 +0000)
which only has to return clk->parent.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/plat-omap/clock.c
arch/arm/plat-omap/include/mach/clock.h

index 7b040072859410baaa763c7568359c46bb3a526d..ae77e10719f250cde3ac06942a84afe26451595b 100644 (file)
@@ -207,18 +207,7 @@ EXPORT_SYMBOL(clk_set_parent);
 
 struct clk *clk_get_parent(struct clk *clk)
 {
-       unsigned long flags;
-       struct clk * ret = NULL;
-
-       if (clk == NULL || IS_ERR(clk))
-               return ret;
-
-       spin_lock_irqsave(&clockfw_lock, flags);
-       if (arch_clock->clk_get_parent)
-               ret = arch_clock->clk_get_parent(clk);
-       spin_unlock_irqrestore(&clockfw_lock, flags);
-
-       return ret;
+       return clk->parent;
 }
 EXPORT_SYMBOL(clk_get_parent);
 
index 4831bbdaf014743d9eacf5da34bf6d6faaab2406..06dd38a8a0c0949f51aa4f45cf0f19e84a6e2710 100644 (file)
@@ -102,7 +102,6 @@ struct clk_functions {
        long            (*clk_round_rate)(struct clk *clk, unsigned long rate);
        int             (*clk_set_rate)(struct clk *clk, unsigned long rate);
        int             (*clk_set_parent)(struct clk *clk, struct clk *parent);
-       struct clk *    (*clk_get_parent)(struct clk *clk);
        void            (*clk_allow_idle)(struct clk *clk);
        void            (*clk_deny_idle)(struct clk *clk);
        void            (*clk_disable_unused)(struct clk *clk);