From e6b3e3eb278b7c7a3c6b53db289b766e2d30ce93 Mon Sep 17 00:00:00 2001 From: Amit Nischal Date: Fri, 21 Oct 2016 21:10:56 +0530 Subject: [PATCH] clk: qcom: Remove non-op BRANCH_HALT_NO_CHECK_ON_DISABLE flag BRANCH_HALT_NO_CHECK_ON_DISABLE flag is no longer required for the clocks with no branch halt status check status during clock disable so removing the usage of the flag. Change-Id: Id58f1bf1f5b1b68acc8fe3d4d79450730f466f0b Signed-off-by: Amit Nischal --- drivers/clk/qcom/clk-branch.c | 3 --- drivers/clk/qcom/clk-branch.h | 4 ---- 2 files changed, 7 deletions(-) diff --git a/drivers/clk/qcom/clk-branch.c b/drivers/clk/qcom/clk-branch.c index 0987c8e7f807..8aea1d519311 100644 --- a/drivers/clk/qcom/clk-branch.c +++ b/drivers/clk/qcom/clk-branch.c @@ -83,9 +83,6 @@ static int clk_branch_wait(const struct clk_branch *br, bool enabling, if (br->halt_check == BRANCH_HALT_DELAY || (!enabling && voted)) { udelay(10); - } else if ((br->halt_check == BRANCH_HALT_NO_CHECK_ON_DISABLE) && - !enabling) { - return 0; } else if (br->halt_check == BRANCH_HALT_ENABLE || br->halt_check == BRANCH_HALT || (enabling && voted)) { diff --git a/drivers/clk/qcom/clk-branch.h b/drivers/clk/qcom/clk-branch.h index 331f58d651e5..8a934cf8bed1 100644 --- a/drivers/clk/qcom/clk-branch.h +++ b/drivers/clk/qcom/clk-branch.h @@ -42,10 +42,6 @@ struct clk_branch { #define BRANCH_HALT_ENABLE 1 /* pol: 0 = halt */ #define BRANCH_HALT_ENABLE_VOTED (BRANCH_HALT_ENABLE | BRANCH_VOTED) #define BRANCH_HALT_DELAY 2 /* No bit to check; just delay */ -/* No halt check during clk disable for the clocks controlled by other masters - * via voting registers like SMMU clocks. - */ -#define BRANCH_HALT_NO_CHECK_ON_DISABLE 4 struct clk_regmap clkr; };