msm: clock: Clean-up auto-off ops
Now that the voltage scaling code has been pushed up into clock.c,
RCG and branch clock auto-off ops do the same thing as the disable
ops. Remove the duplicated/unnecessary code. The RPM clock auto-off
function does nothing and can be removed, also.
Change-Id: I2a42edc52b73f5198b1b81d053cf7d4775cf1a49
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 2cc1c5f..615a6b5 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -599,7 +599,7 @@
static struct clk_ops clk_ops_rcg_8960 = {
.enable = rcg_clk_enable,
.disable = rcg_clk_disable,
- .auto_off = rcg_clk_auto_off,
+ .auto_off = rcg_clk_disable,
.handoff = rcg_clk_handoff,
.set_rate = rcg_clk_set_rate,
.set_min_rate = rcg_clk_set_min_rate,
@@ -615,7 +615,7 @@
static struct clk_ops clk_ops_branch = {
.enable = branch_clk_enable,
.disable = branch_clk_disable,
- .auto_off = branch_clk_auto_off,
+ .auto_off = branch_clk_disable,
.is_enabled = branch_clk_is_enabled,
.reset = branch_clk_reset,
.is_local = local_clk_is_local,
@@ -1432,7 +1432,7 @@
const struct qdss_bank *bank = clk->bank_info;
u32 reg, bank_sel_mask = bank->bank_sel_mask;
- rcg_clk_auto_off(c);
+ rcg_clk_disable(c);
/* Switch to bank 0 */
reg = readl_relaxed(clk->ns_reg);
reg &= ~bank_sel_mask;