From a3512b1ec718ad952d3d138057244a89f3449ba4 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 8 Feb 2009 17:49:22 +0000 Subject: [PATCH] --- yaml --- r: 137291 b: refs/heads/master c: 2e777bf1f2482be13c2b678744d3497a4f0a0ec2 h: refs/heads/master i: 137289: e2ff165472f160ee1d09eb6279918fab3d5c4d85 137287: edbee4751b8d2badad75e5c0ba405af38f8628d7 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/clock.c | 13 +------------ trunk/arch/arm/plat-omap/include/mach/clock.h | 1 - 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 1b7692b3a982..635d08b16a35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae8fce5c3baf84e319269e67823cf337ed9d359a +refs/heads/master: 2e777bf1f2482be13c2b678744d3497a4f0a0ec2 diff --git a/trunk/arch/arm/plat-omap/clock.c b/trunk/arch/arm/plat-omap/clock.c index 7b0400728594..ae77e10719f2 100644 --- a/trunk/arch/arm/plat-omap/clock.c +++ b/trunk/arch/arm/plat-omap/clock.c @@ -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); diff --git a/trunk/arch/arm/plat-omap/include/mach/clock.h b/trunk/arch/arm/plat-omap/include/mach/clock.h index 4831bbdaf014..06dd38a8a0c0 100644 --- a/trunk/arch/arm/plat-omap/include/mach/clock.h +++ b/trunk/arch/arm/plat-omap/include/mach/clock.h @@ -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);