From: Yue Hu <huyue2@xxxxxxxxxx> cqhci_dma_map() will be only called by cqhci_prep_tran_desc() which already has 'mrq->data'. Signed-off-by: Yue Hu <huyue2@xxxxxxxxxx> --- 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