mmc: dw_mmc: remove system PM callback

Now there are no variant drivers using dw_mci_suspend
and dw_mci_resume, so let's remove it.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 7cf3394139e4cbc82574ecd80513fdf5c83a0a9b..d426fa41bcce4605dc1f570ba4b87a91d39a62d4 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -3268,27 +3268,41 @@ EXPORT_SYMBOL(dw_mci_remove);
 
 
 #ifdef CONFIG_PM
-/*
- * TODO: we should probably disable the clock to the card in the suspend path.
- */
-int dw_mci_suspend(struct dw_mci *host)
+int dw_mci_runtime_suspend(struct device *dev)
 {
+       struct dw_mci *host = dev_get_drvdata(dev);
+
        if (host->use_dma && host->dma_ops->exit)
                host->dma_ops->exit(host);
 
+       clk_disable_unprepare(host->ciu_clk);
+
+       if (host->cur_slot &&
+           (mmc_can_gpio_cd(host->cur_slot->mmc) ||
+            !mmc_card_is_removable(host->cur_slot->mmc)))
+               clk_disable_unprepare(host->biu_clk);
+
        return 0;
 }
-EXPORT_SYMBOL(dw_mci_suspend);
+EXPORT_SYMBOL(dw_mci_runtime_suspend);
 
-int dw_mci_resume(struct dw_mci *host)
+int dw_mci_runtime_resume(struct device *dev)
 {
-       int i, ret;
+       int i, ret = 0;
+       struct dw_mci *host = dev_get_drvdata(dev);
 
-       if (!dw_mci_ctrl_reset(host, SDMMC_CTRL_ALL_RESET_FLAGS)) {
-               ret = -ENODEV;
-               return ret;
+       if (host->cur_slot &&
+           (mmc_can_gpio_cd(host->cur_slot->mmc) ||
+            !mmc_card_is_removable(host->cur_slot->mmc))) {
+               ret = clk_prepare_enable(host->biu_clk);
+               if (ret)
+                       return ret;
        }
 
+       ret = clk_prepare_enable(host->ciu_clk);
+       if (ret)
+               return ret;
+
        if (host->use_dma && host->dma_ops->init)
                host->dma_ops->init(host);
 
@@ -3296,8 +3310,8 @@ int dw_mci_resume(struct dw_mci *host)
         * Restore the initial value at FIFOTH register
         * And Invalidate the prev_blksz with zero
         */
-       mci_writel(host, FIFOTH, host->fifoth_val);
-       host->prev_blksz = 0;
+        mci_writel(host, FIFOTH, host->fifoth_val);
+        host->prev_blksz = 0;
 
        /* Put in max timeout */
        mci_writel(host, TMOUT, 0xFFFFFFFF);
@@ -3322,48 +3336,7 @@ int dw_mci_resume(struct dw_mci *host)
        /* Now that slots are all setup, we can enable card detect */
        dw_mci_enable_cd(host);
 
-       return 0;
-}
-EXPORT_SYMBOL(dw_mci_resume);
-
-int dw_mci_runtime_suspend(struct device *dev)
-{
-       int err = 0;
-       struct dw_mci *host = dev_get_drvdata(dev);
-
-       err = dw_mci_suspend(host);
-       if (err)
-               return err;
-
-       clk_disable_unprepare(host->ciu_clk);
-
-       if (host->cur_slot &&
-           (mmc_can_gpio_cd(host->cur_slot->mmc) ||
-            !mmc_card_is_removable(host->cur_slot->mmc)))
-               clk_disable_unprepare(host->biu_clk);
-
-       return err;
-}
-EXPORT_SYMBOL(dw_mci_runtime_suspend);
-
-int dw_mci_runtime_resume(struct device *dev)
-{
-       int ret = 0;
-       struct dw_mci *host = dev_get_drvdata(dev);
-
-       if (host->cur_slot &&
-           (mmc_can_gpio_cd(host->cur_slot->mmc) ||
-            !mmc_card_is_removable(host->cur_slot->mmc))) {
-               ret = clk_prepare_enable(host->biu_clk);
-               if (ret)
-                       return ret;
-       }
-
-       ret = clk_prepare_enable(host->ciu_clk);
-       if (ret)
-               return ret;
-
-       return dw_mci_resume(host);
+       return ret;
 }
 EXPORT_SYMBOL(dw_mci_runtime_resume);
 #endif /* CONFIG_PM */

diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
index d14a391eb7092b910ec8c186cec6c56daa8e9297..4a6ae750feebc70377a77c8b88a7032f52b08d27 100644 (file)
--- a/drivers/mmc/host/dw_mmc.h
+++ b/drivers/mmc/host/dw_mmc.h
@@ -235,8 +235,6 @@
 extern int dw_mci_probe(struct dw_mci *host);
 extern void dw_mci_remove(struct dw_mci *host);
 #ifdef CONFIG_PM
-extern int dw_mci_suspend(struct dw_mci *host);
-extern int dw_mci_resume(struct dw_mci *host);
 extern int dw_mci_runtime_suspend(struct device *device);
 extern int dw_mci_runtime_resume(struct device *device);
 #endif