From patchwork Fri Nov 25 10:07:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 9447199 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 068CE6071B for ; Fri, 25 Nov 2016 10:13:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8A0528118 for ; Fri, 25 Nov 2016 10:13:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD78228159; Fri, 25 Nov 2016 10:13:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9127428118 for ; Fri, 25 Nov 2016 10:13:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753378AbcKYKNu (ORCPT ); Fri, 25 Nov 2016 05:13:50 -0500 Received: from mga04.intel.com ([192.55.52.120]:14911 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752985AbcKYKNt (ORCPT ); Fri, 25 Nov 2016 05:13:49 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP; 25 Nov 2016 02:13:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,546,1473145200"; d="scan'208";a="9243368" Received: from ahunter-desktop.fi.intel.com ([10.237.72.168]) by orsmga002.jf.intel.com with ESMTP; 25 Nov 2016 02:13:43 -0800 From: Adrian Hunter 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 Subject: [PATCH V7 18/25] mmc: block: Pass mqrq to mmc_blk_prep_packed_list() Date: Fri, 25 Nov 2016 12:07:15 +0200 Message-Id: <1480068442-5169-19-git-send-email-adrian.hunter@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1480068442-5169-1-git-send-email-adrian.hunter@intel.com> References: <1480068442-5169-1-git-send-email-adrian.hunter@intel.com> Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A subsequent patch will remove 'mq->mqrq_cur'. Prepare for that by passing mqrq to mmc_blk_prep_packed_list(). Signed-off-by: Adrian Hunter --- drivers/mmc/card/block.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index c1745f2270ba..ebc5d2ff8f32 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1741,13 +1741,14 @@ static inline u8 mmc_calc_packed_hdr_segs(struct request_queue *q, return nr_segs; } -static u8 mmc_blk_prep_packed_list(struct mmc_queue *mq, struct request *req) +static u8 mmc_blk_prep_packed_list(struct mmc_queue *mq, + struct mmc_queue_req *mqrq) { struct request_queue *q = mq->queue; struct mmc_card *card = mq->card; + struct request *req = mqrq->req; struct request *cur = req, *next = NULL; struct mmc_blk_data *md = mq->blkdata; - struct mmc_queue_req *mqrq = mq->mqrq_cur; bool en_rel_wr = card->ext_csd.rel_param & EXT_CSD_WR_REL_PARAM_EN; unsigned int req_sectors = 0, phys_segments = 0; unsigned int max_blk_count, max_phys_segs; @@ -2048,8 +2049,8 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) if (!rqc && !mq->mqrq_prev->req) return 0; - if (rqc) - reqs = mmc_blk_prep_packed_list(mq, rqc); + if (mqrq_cur) + reqs = mmc_blk_prep_packed_list(mq, mqrq_cur); do { if (rqc) {