mmc: rk_sdmmc: remove hpclk ops in set_sdio_status callback
authorlintao <lintao@rock-chips.com>
Mon, 23 Mar 2015 02:45:44 +0000 (10:45 +0800)
committerlintao <lintao@rock-chips.com>
Mon, 23 Mar 2015 02:45:44 +0000 (10:45 +0800)
Signed-off-by: lintao <lintao@rock-chips.com>
drivers/mmc/host/rk_sdmmc.c

index 9d254bd82bb5ac3d36e0c46074103e825e828da6..3a81403f37474a1b775960d5fee1e653fc2a5126 100755 (executable)
@@ -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);