ARM: tegra: clock: Rename shared bus operations.

Renamed shared_bus operations that are actually applied to bus
user clock (rather than bus clock itself) to shared_bus_user
operations.

Change-Id: Ic73db770264f4890a2c93e54dff16fe6c97d2c3e
Signed-off-by: Alex Frid <afrid@nvidia.com>
Reviewed-on: http://git-master/r/159748
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Jin Qian <jqian@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Kaz Fukuoka <kfukuoka@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>

1 files changed, 13 insertions, 12 deletions

diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index c4bd803b5a74..bc394ac563ac 100644
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@ -1621,7 +1621,7 @@ static int tegra2_clk_shared_bus_update(struct clk *bus)
 	return clk_set_rate_locked(bus, rate);
 };
 
-static void tegra_clk_shared_bus_init(struct clk *c)
+static void tegra_clk_shared_bus_user_init(struct clk *c)
 {
 	unsigned long flags;
 
@@ -1638,7 +1638,7 @@ static void tegra_clk_shared_bus_init(struct clk *c)
 	clk_unlock_restore(c->parent, &flags);
 }
 
-static int tegra_clk_shared_bus_set_rate(struct clk *c, unsigned long rate)
+static int tegra_clk_shared_bus_user_set_rate(struct clk *c, unsigned long rate)
 {
 	int ret;
 	long new_rate = rate;
@@ -1653,12 +1653,13 @@ static int tegra_clk_shared_bus_set_rate(struct clk *c, unsigned long rate)
 	return ret;
 }
 
-static long tegra_clk_shared_bus_round_rate(struct clk *c, unsigned long rate)
+static long tegra_clk_shared_bus_user_round_rate(
+	struct clk *c, unsigned long rate)
 {
 	return clk_round_rate(c->parent, rate);
 }
 
-static int tegra_clk_shared_bus_enable(struct clk *c)
+static int tegra_clk_shared_bus_user_enable(struct clk *c)
 {
 	int ret;
 
@@ -1670,7 +1671,7 @@ static int tegra_clk_shared_bus_enable(struct clk *c)
 	return ret;
 }
 
-static void tegra_clk_shared_bus_disable(struct clk *c)
+static void tegra_clk_shared_bus_user_disable(struct clk *c)
 {
 	int ret;
 
@@ -1681,12 +1682,12 @@ static void tegra_clk_shared_bus_disable(struct clk *c)
 	WARN_ON_ONCE(ret);
 }
 
-static struct clk_ops tegra_clk_shared_bus_ops = {
-	.init = tegra_clk_shared_bus_init,
-	.enable = tegra_clk_shared_bus_enable,
-	.disable = tegra_clk_shared_bus_disable,
-	.set_rate = tegra_clk_shared_bus_set_rate,
-	.round_rate = tegra_clk_shared_bus_round_rate,
+static struct clk_ops tegra_clk_shared_bus_user_ops = {
+	.init = tegra_clk_shared_bus_user_init,
+	.enable = tegra_clk_shared_bus_user_enable,
+	.disable = tegra_clk_shared_bus_user_disable,
+	.set_rate = tegra_clk_shared_bus_user_set_rate,
+	.round_rate = tegra_clk_shared_bus_user_round_rate,
 };
 
 
@@ -2447,7 +2448,7 @@ static struct clk tegra_clk_emc = {
 			.dev_id    = _dev,		\
 			.con_id    = _con,		\
 		},					\
-		.ops       = &tegra_clk_shared_bus_ops,	\
+		.ops = &tegra_clk_shared_bus_user_ops,	\
 		.parent = _parent,			\
 	}