mmc: start removing enable / disable API

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / omap_hsmmc.c

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index e5501704b2db6e0272bb01f91b7dd81c7df403c6..98adf0c51e05bebe09056a19779e717f3a154908 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -167,7 +167,6 @@ struct omap_hsmmc_host {
        int                     got_dbclk;
        int                     response_busy;
        int                     context_loss;
-       int                     dpm_state;
        int                     vdd;
        int                     protect_card;
        int                     reqs_blocked;
@@ -1619,7 +1618,7 @@ static int omap_hsmmc_enable_fclk(struct mmc_host *mmc)
        return 0;
 }
 
-static int omap_hsmmc_disable_fclk(struct mmc_host *mmc, int lazy)
+static int omap_hsmmc_disable_fclk(struct mmc_host *mmc)
 {
        struct omap_hsmmc_host *host = mmc_priv(mmc);
 
@@ -1653,15 +1652,8 @@ static int omap_hsmmc_regs_show(struct seq_file *s, void *data)
        if (host->pdata->get_context_loss_count)
                context_loss = host->pdata->get_context_loss_count(host->dev);
 
-       seq_printf(s, "mmc%d:\n"
-                       " enabled:\t%d\n"
-                       " dpm_state:\t%d\n"
-                       " nesting_cnt:\t%d\n"
-                       " ctx_loss:\t%d:%d\n"
-                       "\nregs:\n",
-                       mmc->index, mmc->enabled ? 1 : 0,
-                       host->dpm_state, mmc->nesting_cnt,
-                       host->context_loss, context_loss);
+       seq_printf(s, "mmc%d:\n ctx_loss:\t%d:%d\n\nregs:\n",
+                       mmc->index, host->context_loss, context_loss);
 
        if (host->suspended) {
                seq_printf(s, "host suspended, can't read registers\n");
@@ -1800,7 +1792,6 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
 
        omap_hsmmc_context_save(host);
 
-       mmc->caps |= MMC_CAP_DISABLE;
        if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
                dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
                mmc->caps2 |= MMC_CAP2_NO_MULTI_READ;