|
@@ -967,8 +967,6 @@ static void omap_hsmmc_request_done(struct omap_hsmmc_host *host, struct mmc_req
|
|
|
return;
|
|
|
host->mrq = NULL;
|
|
|
mmc_request_done(host->mmc, mrq);
|
|
|
- pm_runtime_mark_last_busy(host->dev);
|
|
|
- pm_runtime_put_autosuspend(host->dev);
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -1249,7 +1247,6 @@ static int omap_hsmmc_switch_opcond(struct omap_hsmmc_host *host, int vdd)
|
|
|
int ret;
|
|
|
|
|
|
/* Disable the clocks */
|
|
|
- pm_runtime_put_sync(host->dev);
|
|
|
if (host->dbclk)
|
|
|
clk_disable_unprepare(host->dbclk);
|
|
|
|
|
@@ -1259,7 +1256,6 @@ static int omap_hsmmc_switch_opcond(struct omap_hsmmc_host *host, int vdd)
|
|
|
/* Turn the power ON with given VDD 1.8 or 3.0v */
|
|
|
if (!ret)
|
|
|
ret = omap_hsmmc_set_power(host, 1, vdd);
|
|
|
- pm_runtime_get_sync(host->dev);
|
|
|
if (host->dbclk)
|
|
|
clk_prepare_enable(host->dbclk);
|
|
|
|
|
@@ -1367,8 +1363,6 @@ static void omap_hsmmc_dma_callback(void *param)
|
|
|
|
|
|
host->mrq = NULL;
|
|
|
mmc_request_done(host->mmc, mrq);
|
|
|
- pm_runtime_mark_last_busy(host->dev);
|
|
|
- pm_runtime_put_autosuspend(host->dev);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1601,7 +1595,6 @@ static void omap_hsmmc_request(struct mmc_host *mmc, struct mmc_request *req)
|
|
|
|
|
|
BUG_ON(host->req_in_progress);
|
|
|
BUG_ON(host->dma_ch != -1);
|
|
|
- pm_runtime_get_sync(host->dev);
|
|
|
if (host->protect_card) {
|
|
|
if (host->reqs_blocked < 3) {
|
|
|
/*
|
|
@@ -1618,8 +1611,6 @@ static void omap_hsmmc_request(struct mmc_host *mmc, struct mmc_request *req)
|
|
|
req->data->error = -EBADF;
|
|
|
req->cmd->retries = 0;
|
|
|
mmc_request_done(mmc, req);
|
|
|
- pm_runtime_mark_last_busy(host->dev);
|
|
|
- pm_runtime_put_autosuspend(host->dev);
|
|
|
return;
|
|
|
} else if (host->reqs_blocked)
|
|
|
host->reqs_blocked = 0;
|
|
@@ -1633,8 +1624,6 @@ static void omap_hsmmc_request(struct mmc_host *mmc, struct mmc_request *req)
|
|
|
req->data->error = err;
|
|
|
host->mrq = NULL;
|
|
|
mmc_request_done(mmc, req);
|
|
|
- pm_runtime_mark_last_busy(host->dev);
|
|
|
- pm_runtime_put_autosuspend(host->dev);
|
|
|
return;
|
|
|
}
|
|
|
if (req->sbc && !(host->flags & AUTO_CMD23)) {
|
|
@@ -1652,8 +1641,6 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
|
|
struct omap_hsmmc_host *host = mmc_priv(mmc);
|
|
|
int do_send_init_stream = 0;
|
|
|
|
|
|
- pm_runtime_get_sync(host->dev);
|
|
|
-
|
|
|
if (ios->power_mode != host->power_mode) {
|
|
|
switch (ios->power_mode) {
|
|
|
case MMC_POWER_OFF:
|
|
@@ -1697,8 +1684,6 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
|
|
|
send_init_stream(host);
|
|
|
|
|
|
omap_hsmmc_set_bus_mode(host);
|
|
|
-
|
|
|
- pm_runtime_put_autosuspend(host->dev);
|
|
|
}
|
|
|
|
|
|
static int omap_hsmmc_get_cd(struct mmc_host *mmc)
|