mmc: msm_sdcc: remove the check for dml busy
dml busy status is supposed to be checked for during bam-to-bam mode
and not in bam-to-system mode. So removing the check for dml busy status
since the driver does not support bam-to-bam mode.
Change-Id: I1496ac441d70dd5efc831768f5ed3bfa11a3f94c
Signed-off-by: Krishna Konda <kkonda@codeaurora.org>
(cherry picked from commit 7a05d53e4aec382db2ce646805f6a69756337fdc)
(cherry picked from commit d1a6364ccb9523aca0e5dd6359437bfc3dda51b2)
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index ce8ce25..8bac4ef 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -725,12 +725,6 @@
mmc_hostname(host->mmc), __func__,
notify->event_id);
- if (msmsdcc_is_dml_busy(host)) {
- /* oops !!! this should never happen. */
- pr_err("%s: %s: Received SPS EOT event"
- " but DML HW is still busy !!!\n",
- mmc_hostname(host->mmc), __func__);
- }
/*
* Got End of transfer event!!! Check if all of the data
* has been transferred?
@@ -1241,25 +1235,12 @@
if (is_dma_mode(host) && !msmsdcc_config_dma(host, data)) {
datactrl |= MCI_DPSM_DMAENABLE;
} else if (is_sps_mode(host)) {
- if (!msmsdcc_is_dml_busy(host)) {
- if (!msmsdcc_sps_start_xfer(host, data)) {
- /* Now kick start DML transfer */
- mb();
- msmsdcc_dml_start_xfer(host, data);
- datactrl |= MCI_DPSM_DMAENABLE;
- host->sps.busy = 1;
- }
- } else {
- /*
- * Can't proceed with new transfer as
- * previous trasnfer is already in progress.
- * There is no point of going into PIO mode
- * as well. Is this a time to do kernel panic?
- */
- pr_err("%s: %s: DML HW is busy!!!"
- " Can't perform new SPS transfers"
- " now\n", mmc_hostname(host->mmc),
- __func__);
+ if (!msmsdcc_sps_start_xfer(host, data)) {
+ /* Now kick start DML transfer */
+ mb();
+ msmsdcc_dml_start_xfer(host, data);
+ datactrl |= MCI_DPSM_DMAENABLE;
+ host->sps.busy = 1;
}
}
}