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

Commit 4e1f7800 authored by Linus Walleij's avatar Linus Walleij Committed by Ulf Hansson
Browse files

mmc: block: break out mmc_blk_rw_cmd_abort() 



As a first step toward breaking apart the very complex function
mmc_blk_issue_rw_rq() we break out the command abort code.
This code assumes "ret" is != 0 and then repeatedly hammers
blk_end_request() until the request to the block layer to end
the request succeeds.

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

drivers/mmc/core/block.c

+12 −5
Original line number Diff line number Diff line
@@ -1598,6 +1598,17 @@ static int mmc_blk_cmd_err(struct mmc_blk_data *md, struct mmc_card *card, 
	return ret;

}



static void mmc_blk_rw_cmd_abort(struct mmc_card *card, struct request *req)

{

	int ret = 1;



	if (mmc_card_removed(card))

		req->rq_flags |= RQF_QUIET;

	while (ret)

		ret = blk_end_request(req, -EIO,

				      blk_rq_cur_bytes(req));

}



static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc)

{

	struct mmc_blk_data *md = mq->blkdata;
@@ -1737,11 +1748,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) 
	return 1;



 cmd_abort:

	if (mmc_card_removed(card))

		req->rq_flags |= RQF_QUIET;

	while (ret)

		ret = blk_end_request(req, -EIO,

				blk_rq_cur_bytes(req));

	mmc_blk_rw_cmd_abort(card, req);



 start_new_req:

	if (rqc) {