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

Commit 9d3506ec authored by Ritesh Harjani's avatar Ritesh Harjani Committed by Gerrit - the friendly Code Review server
Browse files

mmc: block: Change mmc_cmdq_wait_for_small_sector_read func 



Change return type to int and req pointer which we need
in subsequent error handling patches.

Change-Id: Ibfbb9579ee955dbed95896246b65749f047978d3
Signed-off-by: default avatarRitesh Harjani <riteshh@codeaurora.org>
parent 60b8c133

drivers/mmc/core/block.c

+10 −6
Original line number Diff line number Diff line
@@ -3440,11 +3440,12 @@ static inline int mmc_blk_cmdq_part_switch(struct mmc_card *card, 
	return ret;

}



static void  mmc_cmdq_wait_for_small_sector_read(struct mmc_card *card)

static int  mmc_cmdq_wait_for_small_sector_read(struct mmc_card *card,

						struct request *req)

{

	struct mmc_host *host = card->host;

	struct mmc_cmdq_context_info *ctx = &host->cmdq_ctx;

	int ret;

	int ret = 0;



	if ((card->quirks & MMC_QUIRK_CMDQ_EMPTY_BEFORE_DCMD) &&

		ctx->active_small_sector_read_reqs) {
@@ -3466,6 +3467,7 @@ static void mmc_cmdq_wait_for_small_sector_read(struct mmc_card *card) 
		 */

		udelay(MMC_QUIRK_CMDQ_DELAY_BEFORE_DCMD);

	}

	return ret;

}



static int mmc_blk_cmdq_issue_drv_op(struct mmc_card *card, struct request *req)
@@ -3570,7 +3572,8 @@ static int mmc_blk_cmdq_issue_rq(struct mmc_queue *mq, struct request *req) 
	if (req) {

		switch (req_op(req)) {

		case REQ_OP_DISCARD:

			mmc_cmdq_wait_for_small_sector_read(card);

			ret = mmc_cmdq_wait_for_small_sector_read(card, req);

			if (!ret)

				ret = mmc_blk_cmdq_issue_discard_rq(mq, req);

			break;

		case REQ_OP_SECURE_ERASE:
@@ -3580,7 +3583,8 @@ static int mmc_blk_cmdq_issue_rq(struct mmc_queue *mq, struct request *req) 
				ret = mmc_blk_cmdq_issue_discard_rq(mq, req);

			break;

		case REQ_OP_FLUSH:

			mmc_cmdq_wait_for_small_sector_read(card);

			ret = mmc_cmdq_wait_for_small_sector_read(card, req);

			if (!ret)

				ret = mmc_blk_cmdq_issue_flush_rq(mq, req);

			break;

		case REQ_OP_DRV_IN: