Loading arch/arm/plat-omap/clock.c +1 −12 Original line number Diff line number Diff line Loading @@ -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); Loading arch/arm/plat-omap/include/mach/clock.h +0 −1 Original line number Diff line number Diff line Loading @@ -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); Loading Loading
arch/arm/plat-omap/clock.c +1 −12 Original line number Diff line number Diff line Loading @@ -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); Loading
arch/arm/plat-omap/include/mach/clock.h +0 −1 Original line number Diff line number Diff line Loading @@ -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); Loading