From: lintao <lintao@rock-chips.com>
Date: Mon, 23 Mar 2015 02:45:44 +0000 (+0800)
Subject: mmc: rk_sdmmc: remove hpclk ops in set_sdio_status callback
X-Git-Tag: firefly_0821_release~4158^2~309
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=415ae49f47046f228bb701544d007b381670906b;p=firefly-linux-kernel-4.4.55.git

mmc: rk_sdmmc: remove hpclk ops in set_sdio_status callback

Signed-off-by: lintao <lintao@rock-chips.com>
---

diff --git a/drivers/mmc/host/rk_sdmmc.c b/drivers/mmc/host/rk_sdmmc.c
index 9d254bd82bb5..3a81403f3747 100755
--- a/drivers/mmc/host/rk_sdmmc.c
+++ b/drivers/mmc/host/rk_sdmmc.c
@@ -1540,22 +1540,16 @@ static int dw_mci_set_sdio_status(struct mmc_host *mmc, int val)
 
         spin_unlock_bh(&host->lock);
 
-        if(test_bit(DW_MMC_CARD_PRESENT, &slot->flags)){
-                if (!IS_ERR(host->hpclk_mmc) &&
-			 __clk_is_enabled(host->hpclk_mmc) == false)
-			 clk_prepare_enable(host->hpclk_mmc);
+        if (test_bit(DW_MMC_CARD_PRESENT, &slot->flags)) {
 		if (__clk_is_enabled(host->hclk_mmc) == false)
                         clk_prepare_enable(host->hclk_mmc);
-                if (__clk_is_enabled(host->clk_mmc) == false)
+		if (__clk_is_enabled(host->clk_mmc) == false)
                         clk_prepare_enable(host->clk_mmc);
-        }else{
-                if (__clk_is_enabled(host->clk_mmc) == true)
+        } else {
+		if (__clk_is_enabled(host->clk_mmc) == true)
                         clk_disable_unprepare(slot->host->clk_mmc);
-                if (__clk_is_enabled(host->hclk_mmc) == true)
+		if (__clk_is_enabled(host->hclk_mmc) == true)
                         clk_disable_unprepare(slot->host->hclk_mmc);
-		if (!IS_ERR(host->hpclk_mmc) &&
-			__clk_is_enabled(host->hpclk_mmc) == true)
-			clk_disable_unprepare(slot->host->hpclk_mmc);
         }
 
         mmc_detect_change(slot->mmc, 20);