From: Adrian Hunter Subject: [PATCH V9 01/11] mmc: block: Use local var for mqrq_cur Date: Thu, 8 Dec 2016 10:44:28 +0200 Message-ID: <1481186678-6307-2-git-send-email-adrian.hunter@intel.com> References: <1481186678-6307-1-git-send-email-adrian.hunter@intel.com> Return-path: Received: from mga07.intel.com ([134.134.136.100]:38669 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751567AbcLHIts (ORCPT ); Thu, 8 Dec 2016 03:49:48 -0500 In-Reply-To: <1481186678-6307-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 , Dorfman Konstantin , David Griego , Sahitya Tummala , Harjani Ritesh , Venu Byravarasu , Linus Walleij A subsequent patch will remove 'mq->mqrq_cur'. Prepare for that by assigning it to a local variable. Signed-off-by: Adrian Hunter Reviewed-by: Linus Walleij --- drivers/mmc/card/block.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 646d1a1fa6ca..6e3c13811706 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1600,6 +1600,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; @@ -1617,14 +1618,14 @@ 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; } - 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, &status); @@ -1744,9 +1745,9 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) rqc->cmd_flags |= REQ_QUIET; blk_end_request_all(rqc, -EIO); } else { - 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