ARM: tegra: clock: Update LP-cluster related interfaces

Original-Change-Id: Ifde476a05bd01cdce8c3f4802b268a193a832a1b
Reviewed-on: http://git-master/r/14584
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Tested-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Original-Change-Id: I41204d17c5d8092b1a24b3138efe12cfbd16d7e7

Rebase-Id: R9754ff5e07ecabd945edfccdbc0f9d9586be6e23

1 files changed, 11 insertions, 10 deletions

diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index 0096f6f102d3..7203486ac834 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -115,6 +115,14 @@ static unsigned long clk_predict_rate_from_parent(struct clk *c, struct clk *p)
 	return rate;
 }
 
+static unsigned long clk_get_max_rate(struct clk *c)
+{
+	if (c->ops && c->ops->get_max_rate)
+		return c->ops->get_max_rate(c);
+	else
+		return c->max_rate;
+}
+
 /* Must be called with clk_lock(c) held */
 unsigned long clk_get_rate_locked(struct clk *c)
 {
@@ -319,9 +327,7 @@ int clk_set_rate_locked(struct clk *c, unsigned long rate)
 
 	old_rate = clk_get_rate_locked(c);
 
-	max_rate = c->max_rate;
-	if (c->ops && c->ops->get_max_rate)
-		max_rate = c->ops->get_max_rate(c);
+	max_rate = clk_get_max_rate(c);
 	if (rate > max_rate)
 		rate = max_rate;
 
@@ -408,9 +414,7 @@ long clk_round_rate(struct clk *c, unsigned long rate)
 		goto out;
 	}
 
-	max_rate = c->max_rate;
-	if (c->ops && c->ops->get_max_rate)
-		max_rate = c->ops->get_max_rate(c);
+	max_rate = clk_get_max_rate(c);
 	if (rate > max_rate)
 		rate = max_rate;
 
@@ -690,10 +694,7 @@ static void clock_tree_show_one(struct seq_file *s, struct clk *c, int level)
 	const char *state = "uninit";
 	char div[8] = {0};
 	unsigned long rate = clk_get_rate_all_locked(c);
-	unsigned long max_rate = c->max_rate;
-
-	if (c->ops && c->ops->get_max_rate)
-		max_rate = c->ops->get_max_rate(c);
+	unsigned long max_rate = clk_get_max_rate(c);;
 
 	if (c->state == ON)
 		state = "on";