From patchwork Fri Nov 24 16:24:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 119608 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2443586qgn; Fri, 24 Nov 2017 08:27:23 -0800 (PST) X-Google-Smtp-Source: AGs4zMZ9nr5w/Dr/d3lVQ2rSoQlRn9vjcxpYA2HraMkfyAIABfwgttxXLOUfY1d2znCpB/fB8hC6 X-Received: by 10.99.146.18 with SMTP id o18mr28727673pgd.380.1511540843515; Fri, 24 Nov 2017 08:27:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511540843; cv=none; d=google.com; s=arc-20160816; b=JpYC3XGgxz0o8HWPviKeZhqJcpsMUEtRaOXL9gI0FP0gaCVcakNiD8smqbK/mZBvlF agzrOuBb9TW6gjNfp9eF16GukF8V3fsj/OAhiovCZRzVeboas7yiTF/DMP51Mt6Rnqsg fjYYtRF5sL+Nfwc6Yu6fYsgacQOhVxCEGkoidJAeldB9Ll0GzX5wCHoMMG0QpPPdm8ww 6oozSBWeOfrOXTmERS/IeD08YEFoHiN/mOOswYH/ROWgcwenBvKvMGFh+kfNzcCtvPXL F1XNYVschS3notSkz1UdCNXz5ccmDHO5nGrUwJW+DTUNzCVH2MrNsRKh0sd/+KUTC0N4 +9gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=uf4xdsmFy/5tS6152D2RxyyW0cKOW+rbcaRDW+3mK6s=; b=EZy5/iUCI5YNeX/xAU4UDJ32mKzg5b89Rot00F9F4mqvaN2RMzD+bJBs96XtOlCiVk Hgvfy/2fV2M7ITch2RjWMDkqXQjRfOFYsbQ3LtWB/X29viSzayRUwNxWSmierqOltauf z/7PL4FukMk9JA3LdMuwiUL09W7UC/zeDtE15F5uxHwuMMTTOVyoH4ut6/mvJzbVl5s+ B///rEi1IhLhnKa74nRqD1yQDwtkp3XzFBfEfD7MNrHtyG0ce5GcidbtIdyeBZXV+Cqf hzUt9vJDJJSxc45bNzTPLHIXzAxhwpSahASuZ8C78sQLlXXMivst+ZfUqixu/I2zEYI3 4n/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=KJY7i/ug; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bg3si15390634plb.167.2017.11.24.08.27.23; Fri, 24 Nov 2017 08:27:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=KJY7i/ug; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753802AbdKXQ1V (ORCPT + 6 others); Fri, 24 Nov 2017 11:27:21 -0500 Received: from conuserg-11.nifty.com ([210.131.2.78]:61663 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753798AbdKXQ0I (ORCPT ); Fri, 24 Nov 2017 11:26:08 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-11.nifty.com with ESMTP id vAOGP9W8007100; Sat, 25 Nov 2017 01:25:27 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com vAOGP9W8007100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1511540728; bh=vieGAstKxRkjNgnBdICdlOWJwCrdOoS96FXTnYmioZk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KJY7i/ugLTU5PKD8wTW8IxoUFwa9Kmw2gkdXVNEE4fYz2CBP/bPbBLmQLvSv05HnU n4wb0w3vQbPa63meDluhJYNUiiaP78Qg9uBmAmDMk8dcuAHTk2JdcKT0DvavXvjSts RAlKsEuJ9H4+LTepwwlsq/Hs+x7H0uf0TUCPSSjWeMmVY/LzKdWdip857eK1N9P24B Efs8IuzogXvnMxL1UEte55l7SLhZVJn/Oh7BBAUn9B0RmtSvDNF2FAD2J7pJjxDGoJ R4Ul/vLuFaQ6vF3l7A6SEZ6TRygPzjeoqhNVUth/olS8HHLAtbt/urQeGqesGqdCx3 074OzJazPHrJw== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-mmc@vger.kernel.org, Wolfram Sang Cc: Simon Horman , Yoshihiro Shimoda , linux-renesas-soc@vger.kernel.org, Masahiro Yamada , linux-kernel@vger.kernel.org, Ulf Hansson Subject: [PATCH v2 22/22] mmc: tmio: remove dma_ops from tmio_mmc_host_probe() argument Date: Sat, 25 Nov 2017 01:24:57 +0900 Message-Id: <1511540697-27387-23-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511540697-27387-1-git-send-email-yamada.masahiro@socionext.com> References: <1511540697-27387-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Drivers need to set up various struct members for tmio_mmc_host before calling tmio_mmc_host_probe(). Do likewise for host->dma_ops instead of passing it as a function argument. Signed-off-by: Masahiro Yamada --- Changes in v2: - Newly added drivers/mmc/host/renesas_sdhi_core.c | 3 ++- drivers/mmc/host/tmio_mmc.c | 2 +- drivers/mmc/host/tmio_mmc.h | 3 +-- drivers/mmc/host/tmio_mmc_core.c | 4 +--- 4 files changed, 5 insertions(+), 7 deletions(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index a5749d7..825378a 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -531,6 +531,7 @@ int renesas_sdhi_probe(struct platform_device *pdev, host->clk_update = renesas_sdhi_clk_update; host->clk_disable = renesas_sdhi_clk_disable; host->multi_io_quirk = renesas_sdhi_multi_io_quirk; + host->dma_ops = dma_ops; /* SDR speeds are only available on Gen2+ */ if (mmc_data->flags & TMIO_MMC_MIN_RCAR2) { @@ -574,7 +575,7 @@ int renesas_sdhi_probe(struct platform_device *pdev, if (ret) goto efree; - ret = tmio_mmc_host_probe(host, dma_ops); + ret = tmio_mmc_host_probe(host); if (ret < 0) goto edisclk; diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c index 11b87ce..43a2ea5 100644 --- a/drivers/mmc/host/tmio_mmc.c +++ b/drivers/mmc/host/tmio_mmc.c @@ -104,7 +104,7 @@ static int tmio_mmc_probe(struct platform_device *pdev) host->mmc->f_max = pdata->hclk; host->mmc->f_min = pdata->hclk / 512; - ret = tmio_mmc_host_probe(host, NULL); + ret = tmio_mmc_host_probe(host); if (ret) goto host_free; diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index f46d282..7609434 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -198,8 +198,7 @@ struct tmio_mmc_host { struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev, struct tmio_mmc_data *pdata); void tmio_mmc_host_free(struct tmio_mmc_host *host); -int tmio_mmc_host_probe(struct tmio_mmc_host *host, - const struct tmio_mmc_dma_ops *dma_ops); +int tmio_mmc_host_probe(struct tmio_mmc_host *host); void tmio_mmc_host_remove(struct tmio_mmc_host *host); void tmio_mmc_do_data_irq(struct tmio_mmc_host *host); diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 02e1438..1d60a41 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1210,8 +1210,7 @@ void tmio_mmc_host_free(struct tmio_mmc_host *host) } EXPORT_SYMBOL_GPL(tmio_mmc_host_free); -int tmio_mmc_host_probe(struct tmio_mmc_host *_host, - const struct tmio_mmc_dma_ops *dma_ops) +int tmio_mmc_host_probe(struct tmio_mmc_host *_host) { struct platform_device *pdev = _host->pdev; struct tmio_mmc_data *pdata = _host->pdata; @@ -1304,7 +1303,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host, INIT_WORK(&_host->done, tmio_mmc_done_work); /* See if we also get DMA */ - _host->dma_ops = dma_ops; tmio_mmc_request_dma(_host, pdata); pm_runtime_set_active(&pdev->dev);