Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Yue Hu <zbestahu@gmail.com>
To:     adrian.hunter@intel.com, riteshh@codeaurora.org,
        asutoshd@codeaurora.org, ulf.hansson@linaro.org
Cc:     linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
        huyue2@yulong.com, zbestahu@163.com
Subject: [PATCH] mmc: cqhci: use data instead of mrq parameter from cqhci_dma_map()
Date:   Thu, 20 May 2021 18:00:36 +0800
Message-Id: <20210520100036.2195-1-zbestahu@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Yue Hu <huyue2@yulong.com>

cqhci_dma_map() will be only called by cqhci_prep_tran_desc() which
already has 'mrq->data'.

Signed-off-by: Yue Hu <huyue2@yulong.com>
---
 drivers/mmc/host/cqhci-core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/cqhci-core.c b/drivers/mmc/host/cqhci-core.c
index 93b0432..e759e3b 100644
--- a/drivers/mmc/host/cqhci-core.c
+++ b/drivers/mmc/host/cqhci-core.c
@@ -446,10 +446,9 @@ static void cqhci_prep_task_desc(struct mmc_request *mrq,
 	}
 }
 
-static int cqhci_dma_map(struct mmc_host *host, struct mmc_request *mrq)
+static int cqhci_dma_map(struct mmc_host *host, struct mmc_data *data)
 {
 	int sg_count;
-	struct mmc_data *data = mrq->data;
 
 	if (!data)
 		return -EINVAL;
@@ -499,7 +498,7 @@ static int cqhci_prep_tran_desc(struct mmc_request *mrq,
 	u8 *desc;
 	struct scatterlist *sg;
 
-	sg_count = cqhci_dma_map(mrq->host, mrq);
+	sg_count = cqhci_dma_map(mrq->host, data);
 	if (sg_count < 0) {
 		pr_err("%s: %s: unable to map sg lists, %d\n",
 				mmc_hostname(mrq->host), __func__, sg_count);
-- 
1.9.1