leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: dw_mmc: call the dw_mci_prep_stop_abort() by default

Browse Source 
stop_cmdr should be set to values relevant to stop command.
It migth be assigned to values whatever there is mrq->stop or not.
Then it doesn't need to use dw_mci_prepare_command().
It's enough to use the prep_stop_abort for preparing stop command.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Jaehoon Chung 2016-11-17 16:40:37 +09:00 committed by Ulf Hansson
parent 8c005b4090
commit e13c3c0818
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/mmc/host/dw_mmc.c
View File

@ -385,7 +385,7 @@ static void dw_mci_start_command(struct dw_mci *host,
static inline void send_stop_abort(struct dw_mci *host, struct mmc_data *data) static inline void send_stop_abort(struct dw_mci *host, struct mmc_data *data)
{ {
struct mmc_command *stop = data->stop ? data->stop : &host->stop_abort; struct mmc_command *stop = &host->stop_abort;
dw_mci_start_command(host, stop, host->stop_cmdr); dw_mci_start_command(host, stop, host->stop_cmdr);
} }
@ -1278,10 +1278,7 @@ static void __dw_mci_start_request(struct dw_mci *host,
spin_unlock_irqrestore(&host->irq_lock, irqflags); spin_unlock_irqrestore(&host->irq_lock, irqflags);
} }
if (mrq->stop) host->stop_cmdr = dw_mci_prep_stop_abort(host, cmd);
host->stop_cmdr = dw_mci_prepare_command(slot->mmc, mrq->stop);
else
host->stop_cmdr = dw_mci_prep_stop_abort(host, cmd);
} }
static void dw_mci_start_request(struct dw_mci *host, static void dw_mci_start_request(struct dw_mci *host,
@ -1891,8 +1888,7 @@ static void dw_mci_tasklet_func(unsigned long priv)
if (test_and_clear_bit(EVENT_DATA_ERROR, if (test_and_clear_bit(EVENT_DATA_ERROR,
&host->pending_events)) { &host->pending_events)) {
dw_mci_stop_dma(host); dw_mci_stop_dma(host);
if (data->stop || if (!(host->data_status & (SDMMC_INT_DRTO |
!(host->data_status & (SDMMC_INT_DRTO |
SDMMC_INT_EBE))) SDMMC_INT_EBE)))
send_stop_abort(host, data); send_stop_abort(host, data);
state = STATE_DATA_ERROR; state = STATE_DATA_ERROR;
@ -1928,8 +1924,7 @@ static void dw_mci_tasklet_func(unsigned long priv)
if (test_and_clear_bit(EVENT_DATA_ERROR, if (test_and_clear_bit(EVENT_DATA_ERROR,
&host->pending_events)) { &host->pending_events)) {
dw_mci_stop_dma(host); dw_mci_stop_dma(host);
if (data->stop || if (!(host->data_status & (SDMMC_INT_DRTO |
!(host->data_status & (SDMMC_INT_DRTO |
SDMMC_INT_EBE))) SDMMC_INT_EBE)))
send_stop_abort(host, data); send_stop_abort(host, data);
state = STATE_DATA_ERROR; state = STATE_DATA_ERROR;
@ -2005,7 +2000,7 @@ static void dw_mci_tasklet_func(unsigned long priv)
host->cmd = NULL; host->cmd = NULL;
host->data = NULL; host->data = NULL;
if (mrq->stop) if (!mrq->sbc && mrq->stop)
dw_mci_command_complete(host, mrq->stop); dw_mci_command_complete(host, mrq->stop);
else else
host->cmd_status = 0; host->cmd_status = 0;