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-8960.c b/arch/arm/mach-msm/clock-8960.c
index 2846940..96d6055 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -2934,7 +2934,7 @@
struct pix_rdi_clk *rdi = to_pix_rdi_clk(c);
spin_lock_irqsave(&local_clock_reg_lock, flags);
- __branch_clk_enable_reg(&rdi->b, rdi->c.dbg_name);
+ __branch_enable_reg(&rdi->b, rdi->c.dbg_name);
spin_unlock_irqrestore(&local_clock_reg_lock, flags);
rdi->enabled = true;
@@ -2947,7 +2947,7 @@
struct pix_rdi_clk *rdi = to_pix_rdi_clk(c);
spin_lock_irqsave(&local_clock_reg_lock, flags);
- __branch_clk_disable_reg(&rdi->b, rdi->c.dbg_name);
+ __branch_disable_reg(&rdi->b, rdi->c.dbg_name);
spin_unlock_irqrestore(&local_clock_reg_lock, flags);
rdi->enabled = false;
}