From patchwork Tue Jan 26 10:15:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 573156 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B725E1402F0 for ; Tue, 26 Jan 2016 21:25:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933887AbcAZKXu (ORCPT ); Tue, 26 Jan 2016 05:23:50 -0500 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:29953 "EHLO mx0a-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964994AbcAZKUc (ORCPT ); Tue, 26 Jan 2016 05:20:32 -0500 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.15.0.59/8.15.0.59) with SMTP id u0QAJknA004381; Tue, 26 Jan 2016 02:20:02 -0800 Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0a-0016f401.pphosted.com with ESMTP id 20nnw2hv2t-1 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 26 Jan 2016 02:20:02 -0800 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1104.5; Tue, 26 Jan 2016 02:20:01 -0800 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server id 15.0.1104.5 via Frontend Transport; Tue, 26 Jan 2016 02:20:01 -0800 Received: from xhacker.marvell.com (unknown [10.37.135.134]) by maili.marvell.com (Postfix) with ESMTP id 679C93F703F; Tue, 26 Jan 2016 02:19:58 -0800 (PST) From: Jisheng Zhang To: , , , , , , , , , , , , CC: , , , , , , Jisheng Zhang Subject: [PATCH v4 06/13] mmc: sdhci-of-arasan: use sdhci_pltfm_init for private allocation Date: Tue, 26 Jan 2016 18:15:46 +0800 Message-ID: <1453803353-6266-7-git-send-email-jszhang@marvell.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1453803353-6266-1-git-send-email-jszhang@marvell.com> References: <1453803353-6266-1-git-send-email-jszhang@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-01-26_03:, , signatures=0 X-Proofpoint-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1507310008 definitions=main-1601260187 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Commit 0e748234293f ("mmc: sdhci: Add size for caller in init+register") allows users of sdhci_pltfm to allocate private space in calls to sdhci_pltfm_init+sdhci_pltfm_register. This patch migrates the sdhci-of-arasan driver to this allocation. Signed-off-by: Jisheng Zhang Acked-by: Arnd Bergmann --- drivers/mmc/host/sdhci-of-arasan.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c index 50eb8bc..84c8fde 100644 --- a/drivers/mmc/host/sdhci-of-arasan.c +++ b/drivers/mmc/host/sdhci-of-arasan.c @@ -81,7 +81,7 @@ static int sdhci_arasan_suspend(struct device *dev) struct platform_device *pdev = to_platform_device(dev); struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - struct sdhci_arasan_data *sdhci_arasan = pltfm_host->priv; + struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host); int ret; ret = sdhci_suspend_host(host); @@ -106,7 +106,7 @@ static int sdhci_arasan_resume(struct device *dev) struct platform_device *pdev = to_platform_device(dev); struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - struct sdhci_arasan_data *sdhci_arasan = pltfm_host->priv; + struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host); int ret; ret = clk_enable(sdhci_arasan->clk_ahb); @@ -137,10 +137,13 @@ static int sdhci_arasan_probe(struct platform_device *pdev) struct sdhci_pltfm_host *pltfm_host; struct sdhci_arasan_data *sdhci_arasan; - sdhci_arasan = devm_kzalloc(&pdev->dev, sizeof(*sdhci_arasan), - GFP_KERNEL); - if (!sdhci_arasan) - return -ENOMEM; + host = sdhci_pltfm_init(pdev, &sdhci_arasan_pdata, + sizeof(*sdhci_arasan)); + if (IS_ERR(host)) + return PTR_ERR(host); + + pltfm_host = sdhci_priv(host); + sdhci_arasan = sdhci_pltfm_priv(pltfm_host); sdhci_arasan->clk_ahb = devm_clk_get(&pdev->dev, "clk_ahb"); if (IS_ERR(sdhci_arasan->clk_ahb)) { @@ -166,20 +169,12 @@ static int sdhci_arasan_probe(struct platform_device *pdev) goto clk_dis_ahb; } - host = sdhci_pltfm_init(pdev, &sdhci_arasan_pdata, 0); - if (IS_ERR(host)) { - ret = PTR_ERR(host); - goto clk_disable_all; - } - if (of_device_is_compatible(pdev->dev.of_node, "arasan,sdhci-4.9a")) { host->quirks |= SDHCI_QUIRK_NO_HISPD_BIT; host->quirks2 |= SDHCI_QUIRK2_HOST_NO_CMD23; } sdhci_get_of_property(pdev); - pltfm_host = sdhci_priv(host); - pltfm_host->priv = sdhci_arasan; pltfm_host->clk = clk_xin; ret = mmc_of_parse(host->mmc); @@ -209,11 +204,12 @@ static int sdhci_arasan_remove(struct platform_device *pdev) int ret; struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - struct sdhci_arasan_data *sdhci_arasan = pltfm_host->priv; + struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host); + struct clk *clk_ahb = sdhci_arasan->clk_ahb; ret = sdhci_pltfm_unregister(pdev); - clk_disable_unprepare(sdhci_arasan->clk_ahb); + clk_disable_unprepare(clk_ahb); return ret; }