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

Commit d3377c01 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: block: Use local variables in mmc_blk_data_prep() 



Use local variables in mmc_blk_data_prep() in preparation for adding CQE
support which doesn't use the output variables.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent f690f440

drivers/mmc/core/block.c

+18 −11
Original line number Diff line number Diff line
@@ -1575,19 +1575,20 @@ static enum mmc_blk_status mmc_blk_err_check(struct mmc_card *card, 
}



static void mmc_blk_data_prep(struct mmc_queue *mq, struct mmc_queue_req *mqrq,

			      int disable_multi, bool *do_rel_wr,

			      bool *do_data_tag)

			      int disable_multi, bool *do_rel_wr_p,

			      bool *do_data_tag_p)

{

	struct mmc_blk_data *md = mq->blkdata;

	struct mmc_card *card = md->queue.card;

	struct mmc_blk_request *brq = &mqrq->brq;

	struct request *req = mmc_queue_req_to_req(mqrq);

	bool do_rel_wr, do_data_tag;



	/*

	 * Reliable writes are used to implement Forced Unit Access and

	 * are supported only on MMCs.

	 */

	*do_rel_wr = (req->cmd_flags & REQ_FUA) &&

	do_rel_wr = (req->cmd_flags & REQ_FUA) &&

		    rq_data_dir(req) == WRITE &&

		    (md->flags & MMC_BLK_REL_WR);
@@ -1637,14 +1638,14 @@ static void mmc_blk_data_prep(struct mmc_queue *mq, struct mmc_queue_req *mqrq, 
						brq->data.blocks);

	}



	if (*do_rel_wr)

	if (do_rel_wr)

		mmc_apply_rel_rw(brq, card, req);



	/*

	 * Data tag is used only during writing meta data to speed

	 * up write and any subsequent read of this meta data

	 */

	*do_data_tag = card->ext_csd.data_tag_unit_size &&

	do_data_tag = card->ext_csd.data_tag_unit_size &&

		      (req->cmd_flags & REQ_META) &&

		      (rq_data_dir(req) == WRITE) &&

		      ((brq->data.blocks * brq->data.blksz) >=
@@ -1675,6 +1676,12 @@ static void mmc_blk_data_prep(struct mmc_queue *mq, struct mmc_queue_req *mqrq, 
	}



	mqrq->areq.mrq = &brq->mrq;



	if (do_rel_wr_p)

		*do_rel_wr_p = do_rel_wr;



	if (do_data_tag_p)

		*do_data_tag_p = do_data_tag;

}



static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,