msm: clock-local: Rename __branch_clk_*_reg() to __branch_*_reg()

Having "branch_clk" in the names of these functions in inappropriate
since they operate on branches, regardless of whether they are part
of a branch_clk, rcg_clk, cdiv_clk, etc.

Change-Id: Id06d31034405f98352d519d500e22f05cb78e267
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-local.h b/arch/arm/mach-msm/clock-local.h
index c0a7827..034e09c 100644
--- a/arch/arm/mach-msm/clock-local.h
+++ b/arch/arm/mach-msm/clock-local.h
@@ -156,8 +156,8 @@
 extern struct clk_ops clk_ops_reset;
 
 int branch_reset(struct branch *b, enum clk_reset_action action);
-void __branch_clk_enable_reg(const struct branch *b, const char *name);
-u32 __branch_clk_disable_reg(const struct branch *b, const char *name);
+void __branch_enable_reg(const struct branch *b, const char *name);
+u32 __branch_disable_reg(const struct branch *b, const char *name);
 enum handoff branch_handoff(struct branch *b, struct clk *c);
 
 /*