From patchwork Thu Jan 26 15:04:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9539403 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 B2165601D7 for ; Thu, 26 Jan 2017 15:05:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC4AF2684F for ; Thu, 26 Jan 2017 15:05:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F90127F93; Thu, 26 Jan 2017 15:05:00 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 391282684F for ; Thu, 26 Jan 2017 15:05:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753227AbdAZPE7 (ORCPT ); Thu, 26 Jan 2017 10:04:59 -0500 Received: from mail-lf0-f50.google.com ([209.85.215.50]:35278 "EHLO mail-lf0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752821AbdAZPE7 (ORCPT ); Thu, 26 Jan 2017 10:04:59 -0500 Received: by mail-lf0-f50.google.com with SMTP id n124so146580166lfd.2 for ; Thu, 26 Jan 2017 07:04:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=icXlKGlOqYqWA0DEmQqp65GnPJXTog34+G0XL2Zy4Mg=; b=KchSbfsxzHEWrOEKZbpLj28hgFphL1b5UJQvQQ0IPLimD4v/9vmm9iohMU9mUsbevt PUG+TyrwSVLdosH8DBh0M9atuMQCGg0Zqo9M3t9dG0QvyPv3nrxQ7+noizK2bCA1WkCK r68ibwnmbSyqELA1JlAa18q8C5l1SlXjE+PHA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=icXlKGlOqYqWA0DEmQqp65GnPJXTog34+G0XL2Zy4Mg=; b=sKNK2UXkhb2zMeWDIso4ubacL6hRNpQNcFmJ2RZV8wRNSsitauyKQYGscpDY0Sv1u3 2piYKoA76aRBJDItjLWixgcanywuPo8Bq0hghRt/gn+wT8xGcTmBcPkhJ0I9Klnkq3vW RcN3Y3Z05JADd/UJEHmkSHjtsX5fF7Mwzo9a5UWBORELdrBqzQCqtdy/KXIAHbO5RMtb N1SOeX6DAF6mdIR7KTeEdDq3ylEJiNQKE81K5OQe3mbXXOMnbyHqxzba5wcItZSwoYA0 olhKr0iqNQUzjgLwpTPUtkvdI/yaZiCd9/xa77AdEL4y65xid/iTo291XW79HuLwoJY1 aDRA== X-Gm-Message-State: AIkVDXK/hRatNaHUgTqxdOubt12GFkeIvuVxh1fb6hijWIodD8rl03kA1N1ux/kfWoV0ToJa X-Received: by 10.25.202.83 with SMTP id h19mr1123002lfj.33.1485443097514; Thu, 26 Jan 2017 07:04:57 -0800 (PST) Received: from gnarp.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id s7sm540332lja.27.2017.01.26.07.04.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jan 2017 07:04:56 -0800 (PST) From: Linus Walleij To: linux-mmc@vger.kernel.org, linux-block@vger.kernel.org, Ulf Hansson Cc: Chunyan Zhang , Baolin Wang , Paolo Valente , Linus Walleij Subject: [PATCH 5/6] mmc: block: rename mmc_active to areq Date: Thu, 26 Jan 2017 16:04:32 +0100 Message-Id: <20170126150433.14038-5-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170126150433.14038-1-linus.walleij@linaro.org> References: <20170126150433.14038-1-linus.walleij@linaro.org> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The mmc_active member of struct mmc_queue_req has a very confusing name: this is certainly not always "active", it is the asynchronous request associated by the mmc_queue_req but it is not guaranteed to be "active" in any sense, such as being running on the host. Simply rename this member to "areq". Signed-off-by: Linus Walleij --- drivers/mmc/core/block.c | 14 +++++++------- drivers/mmc/core/queue.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 14c33f57776c..04c7162f444e 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1302,7 +1302,7 @@ static enum mmc_blk_status mmc_blk_err_check(struct mmc_card *card, struct mmc_async_req *areq) { struct mmc_queue_req *mq_mrq = container_of(areq, struct mmc_queue_req, - mmc_active); + areq); struct mmc_blk_request *brq = &mq_mrq->brq; struct request *req = mq_mrq->req; int need_retune = card->host->need_retune; @@ -1558,8 +1558,8 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, brq->data.sg_len = i; } - mqrq->mmc_active.mrq = &brq->mrq; - mqrq->mmc_active.err_check = mmc_blk_err_check; + mqrq->areq.mrq = &brq->mrq; + mqrq->areq.err_check = mmc_blk_err_check; mmc_queue_bounce_pre(mqrq); } @@ -1620,7 +1620,7 @@ static void mmc_blk_rw_try_restart(struct mmc_queue *mq, struct request *req) } /* Else proceed and try to restart the current async request */ mmc_blk_rw_rq_prep(mq->mqrq_cur, mq->card, 0, mq); - mmc_start_areq(mq->card->host, &mq->mqrq_cur->mmc_active, NULL); + mmc_start_areq(mq->card->host, &mq->mqrq_cur->areq, NULL); } static void mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *new_req) @@ -1653,7 +1653,7 @@ static void mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *new_req) } mmc_blk_rw_rq_prep(mq->mqrq_cur, card, 0, mq); - new_areq = &mq->mqrq_cur->mmc_active; + new_areq = &mq->mqrq_cur->areq; } else new_areq = NULL; @@ -1673,7 +1673,7 @@ static void mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *new_req) * An asynchronous request has been completed and we proceed * to handle the result of it. */ - mq_rq = container_of(old_areq, struct mmc_queue_req, mmc_active); + mq_rq = container_of(old_areq, struct mmc_queue_req, areq); brq = &mq_rq->brq; old_req = mq_rq->req; type = rq_data_dir(old_req) == READ ? MMC_BLK_READ : MMC_BLK_WRITE; @@ -1779,7 +1779,7 @@ static void mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *new_req) mmc_blk_rw_rq_prep(mq_rq, card, disable_multi, mq); mmc_start_areq(card->host, - &mq_rq->mmc_active, NULL); + &mq_rq->areq, NULL); mq_rq->brq.retune_retry_done = retune_retry_done; } } while (ret); diff --git a/drivers/mmc/core/queue.h b/drivers/mmc/core/queue.h index 0cea02af79d1..e0cd5b1f40ee 100644 --- a/drivers/mmc/core/queue.h +++ b/drivers/mmc/core/queue.h @@ -33,7 +33,7 @@ struct mmc_queue_req { char *bounce_buf; struct scatterlist *bounce_sg; unsigned int bounce_sg_len; - struct mmc_async_req mmc_active; + struct mmc_async_req areq; }; struct mmc_queue {