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

Commit 37dac068 authored by Linus Walleij's avatar Linus Walleij Committed by Ulf Hansson
Browse files

mmc: core: start to break apart mmc_start_areq() 



This function is doing to many clever things at the same time under
too many various conditions.

Start to make things clearer by refactoring: break out the
finalization of the previous asynchronous request to its own
function mmc_finalize_areq(). We can get rid of the default
assignment of status and let the call deal with this.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 0e65f10c

drivers/mmc/core/core.c

+43 −22
Original line number Diff line number Diff line
@@ -630,6 +630,37 @@ static void mmc_post_req(struct mmc_host *host, struct mmc_request *mrq, 
		host->ops->post_req(host, mrq, err);

}



/**

 * mmc_finalize_areq() - finalize an asynchronous request

 * @host: MMC host to finalize any ongoing request on

 *

 * Returns the status of the ongoing asynchronous request, but

 * MMC_BLK_SUCCESS if no request was going on.

 */

static enum mmc_blk_status mmc_finalize_areq(struct mmc_host *host)

{

	enum mmc_blk_status status;



	if (!host->areq)

		return MMC_BLK_SUCCESS;



	status = mmc_wait_for_data_req_done(host, host->areq->mrq);

	if (status == MMC_BLK_NEW_REQUEST)

		return status;



	/*

	 * Check BKOPS urgency for each R1 response

	 */

	if (host->card && mmc_card_mmc(host->card) &&

	    ((mmc_resp_type(host->areq->mrq->cmd) == MMC_RSP_R1) ||

	     (mmc_resp_type(host->areq->mrq->cmd) == MMC_RSP_R1B)) &&

	    (host->areq->mrq->cmd->resp[0] & R1_EXCEPTION_EVENT)) {

		mmc_start_bkops(host->card, true);

	}



	return status;

}



/**

 *	mmc_start_areq - start an asynchronous request

 *	@host: MMC host to start command
@@ -650,7 +681,7 @@ struct mmc_async_req *mmc_start_areq(struct mmc_host *host, 
				     struct mmc_async_req *areq,

				     enum mmc_blk_status *ret_stat)

{

	enum mmc_blk_status status = MMC_BLK_SUCCESS;

	enum mmc_blk_status status;

	int start_err = 0;

	struct mmc_async_req *data = host->areq;
@@ -658,31 +689,21 @@ struct mmc_async_req *mmc_start_areq(struct mmc_host *host, 
	if (areq)

		mmc_pre_req(host, areq->mrq);



	if (host->areq) {

		status = mmc_wait_for_data_req_done(host, host->areq->mrq);

	/* Finalize previous request */

	status = mmc_finalize_areq(host);



	/* The previous request is still going on... */

	if (status == MMC_BLK_NEW_REQUEST) {

		if (ret_stat)

			*ret_stat = status;

			/*

			 * The previous request was not completed,

			 * nothing to return

			 */

		return NULL;

	}

		/*

		 * Check BKOPS urgency for each R1 response

		 */

		if (host->card && mmc_card_mmc(host->card) &&

		    ((mmc_resp_type(host->areq->mrq->cmd) == MMC_RSP_R1) ||

		     (mmc_resp_type(host->areq->mrq->cmd) == MMC_RSP_R1B)) &&

		    (host->areq->mrq->cmd->resp[0] & R1_EXCEPTION_EVENT)) {

			mmc_start_bkops(host->card, true);

		}

	}



	/* Fine so far, start the new request! */

	if (status == MMC_BLK_SUCCESS && areq)

		start_err = __mmc_start_data_req(host, areq->mrq);



	/* Postprocess the old request at this point */

	if (host->areq)

		mmc_post_req(host, host->areq->mrq, 0);