Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e13c3c08 authored by Jaehoon Chung's avatar Jaehoon Chung Committed by Ulf Hansson
Browse files

mmc: dw_mmc: call the dw_mci_prep_stop_abort() by default 



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: default avatarJaehoon Chung <jh80.chung@samsung.com>
Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
Reviewed-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 8c005b40

drivers/mmc/host/dw_mmc.c

+5 −10
Original line number Diff line number Diff line
@@ -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)

{

	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);

}
@@ -1278,9 +1278,6 @@ static void __dw_mci_start_request(struct dw_mci *host, 
		spin_unlock_irqrestore(&host->irq_lock, irqflags);

	}



	if (mrq->stop)

		host->stop_cmdr = dw_mci_prepare_command(slot->mmc, mrq->stop);

	else

	host->stop_cmdr = dw_mci_prep_stop_abort(host, cmd);

}
@@ -1891,8 +1888,7 @@ static void dw_mci_tasklet_func(unsigned long priv) 
			if (test_and_clear_bit(EVENT_DATA_ERROR,

					       &host->pending_events)) {

				dw_mci_stop_dma(host);

				if (data->stop ||

				    !(host->data_status & (SDMMC_INT_DRTO |

				if (!(host->data_status & (SDMMC_INT_DRTO |

							   SDMMC_INT_EBE)))

					send_stop_abort(host, data);

				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,

					       &host->pending_events)) {

				dw_mci_stop_dma(host);

				if (data->stop ||

				    !(host->data_status & (SDMMC_INT_DRTO |

				if (!(host->data_status & (SDMMC_INT_DRTO |

							   SDMMC_INT_EBE)))

					send_stop_abort(host, data);

				state = STATE_DATA_ERROR;
@@ -2005,7 +2000,7 @@ static void dw_mci_tasklet_func(unsigned long priv) 
			host->cmd = NULL;

			host->data = NULL;



			if (mrq->stop)

			if (!mrq->sbc && mrq->stop)

				dw_mci_command_complete(host, mrq->stop);

			else

				host->cmd_status = 0;