From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Hunter Subject: [PATCH RFC 39/46] mmc: block: Use local var for mqrq_cur Date: Thu, 9 Jun 2016 14:52:39 +0300 Message-ID: <1465473166-22532-40-git-send-email-adrian.hunter@intel.com> References: <1465473166-22532-1-git-send-email-adrian.hunter@intel.com> Return-path: Received: from mga01.intel.com ([192.55.52.88]:48207 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750917AbcFIL7X (ORCPT ); Thu, 9 Jun 2016 07:59:23 -0400 In-Reply-To: <1465473166-22532-1-git-send-email-adrian.hunter@intel.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Ulf Hansson Cc: linux-mmc , Alex Lemberg , Mateusz Nowak , Yuliy Izrailov , Jaehoon Chung , Dong Aisheng , Das Asutosh , Zhangfei Gao , Sujit Reddy Thumma , Dorfman Konstantin , David Griego , Sahitya Tummala , Harjani Ritesh A subsequent patch will remove 'mq->mqrq_cur'. Prepare for that by assigning it to a local variable. Signed-off-by: Adrian Hunter --- drivers/mmc/card/block.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index b42318ce0ad7..db28274a7624 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1988,6 +1988,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) struct mmc_blk_request *brq; int ret = 1, disable_multi = 0, retry = 0, type, retune_retry_done = 0; enum mmc_blk_status status; + struct mmc_queue_req *mqrq_cur = mq->mqrq_cur; struct mmc_queue_req *mq_rq; struct request *req; struct mmc_async_req *areq; @@ -2010,18 +2011,18 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) !IS_ALIGNED(blk_rq_sectors(rqc), 8)) { pr_err("%s: Transfer size is not 4KB sector size aligned\n", rqc->rq_disk->disk_name); - mq_rq = mq->mqrq_cur; + mq_rq = mqrq_cur; req = rqc; rqc = NULL; goto cmd_abort; } if (reqs >= packed_nr) - mmc_blk_packed_hdr_wrq_prep(mq->mqrq_cur, + mmc_blk_packed_hdr_wrq_prep(mqrq_cur, card, mq); else - mmc_blk_rw_rq_prep(mq->mqrq_cur, card, 0, mq); - areq = &mq->mqrq_cur->mmc_active; + mmc_blk_rw_rq_prep(mqrq_cur, card, 0, mq); + areq = &mqrq_cur->mmc_active; } else areq = NULL; areq = mmc_start_req(card->host, areq, (int *) &status); @@ -2163,12 +2164,12 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) /* * If current request is packed, it needs to put back. */ - if (mmc_packed_cmd(mq->mqrq_cur->cmd_type)) - mmc_blk_revert_packed_req(mq, mq->mqrq_cur); + if (mmc_packed_cmd(mqrq_cur->cmd_type)) + mmc_blk_revert_packed_req(mq, mqrq_cur); - mmc_blk_rw_rq_prep(mq->mqrq_cur, card, 0, mq); + mmc_blk_rw_rq_prep(mqrq_cur, card, 0, mq); mmc_start_req(card->host, - &mq->mqrq_cur->mmc_active, NULL); + &mqrq_cur->mmc_active, NULL); } } -- 1.9.1