Commit 2e777bf1 authored by Russell King's avatar Russell King Committed by Russell King

[ARM] omap: provide a standard clk_get_parent() implementation

which only has to return clk->parent.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ae8fce5c
...@@ -207,18 +207,7 @@ EXPORT_SYMBOL(clk_set_parent); ...@@ -207,18 +207,7 @@ EXPORT_SYMBOL(clk_set_parent);
struct clk *clk_get_parent(struct clk *clk) struct clk *clk_get_parent(struct clk *clk)
{ {
unsigned long flags; return clk->parent;
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;
} }
EXPORT_SYMBOL(clk_get_parent); EXPORT_SYMBOL(clk_get_parent);
......
...@@ -102,7 +102,6 @@ struct clk_functions { ...@@ -102,7 +102,6 @@ struct clk_functions {
long (*clk_round_rate)(struct clk *clk, unsigned long rate); long (*clk_round_rate)(struct clk *clk, unsigned long rate);
int (*clk_set_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); 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_allow_idle)(struct clk *clk);
void (*clk_deny_idle)(struct clk *clk); void (*clk_deny_idle)(struct clk *clk);
void (*clk_disable_unused)(struct clk *clk); void (*clk_disable_unused)(struct clk *clk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment