From patchwork Wed Jul 6 16:47:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 2488 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 22C8D2413B for ; Wed, 6 Jul 2011 16:41:36 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id C9A11A18ACB for ; Wed, 6 Jul 2011 16:41:35 +0000 (UTC) Received: by qwb8 with SMTP id 8so59725qwb.11 for ; Wed, 06 Jul 2011 09:41:35 -0700 (PDT) Received: by 10.229.1.140 with SMTP id 12mr6661167qcf.118.1309970495240; Wed, 06 Jul 2011 09:41:35 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.48.135 with SMTP id r7cs84175qcf; Wed, 6 Jul 2011 09:41:35 -0700 (PDT) Received: by 10.216.233.92 with SMTP id o70mr4752588weq.57.1309970494138; Wed, 06 Jul 2011 09:41:34 -0700 (PDT) Received: from DB3EHSOBE005.bigfish.com (db3ehsobe005.messaging.microsoft.com [213.199.154.143]) by mx.google.com with ESMTPS id f35si9083702wef.76.2011.07.06.09.41.33 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 06 Jul 2011 09:41:34 -0700 (PDT) Received-SPF: neutral (google.com: 213.199.154.143 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=213.199.154.143; Authentication-Results: mx.google.com; spf=neutral (google.com: 213.199.154.143 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: from mail54-db3-R.bigfish.com (10.3.81.245) by DB3EHSOBE005.bigfish.com (10.3.84.25) with Microsoft SMTP Server id 14.1.225.22; Wed, 6 Jul 2011 16:41:32 +0000 Received: from mail54-db3 (localhost.localdomain [127.0.0.1]) by mail54-db3-R.bigfish.com (Postfix) with ESMTP id DDA17B829C; Wed, 6 Jul 2011 16:41:32 +0000 (UTC) X-SpamScore: -5 X-BigFish: VS-5(z78cMzzz1202hzz8275bh8275dhz2dh87h2a8h668h839h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail54-db3 (localhost.localdomain [127.0.0.1]) by mail54-db3 (MessageSwitch) id 1309970492535890_10435; Wed, 6 Jul 2011 16:41:32 +0000 (UTC) Received: from DB3EHSMHS013.bigfish.com (unknown [10.3.81.246]) by mail54-db3.bigfish.com (Postfix) with ESMTP id 7DCF2630056; Wed, 6 Jul 2011 16:41:32 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB3EHSMHS013.bigfish.com (10.3.87.113) with Microsoft SMTP Server (TLS) id 14.1.225.22; Wed, 6 Jul 2011 16:41:29 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.289.8; Wed, 6 Jul 2011 11:41:27 -0500 Received: from S2100-06.ap.freescale.net (S2100-06.ap.freescale.net [10.192.242.125]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p66GfLGu027675; Wed, 6 Jul 2011 11:41:24 -0500 (CDT) From: Shawn Guo To: CC: , , , Shawn Guo , Troy Kisky , Grant Likely , Wolfram Sang , Chris Ball Subject: [PATCH v3 1/4] mmc: sdhci-esdhc-imx: do not reference platform data after probe Date: Thu, 7 Jul 2011 00:47:47 +0800 Message-ID: <1309970870-13336-2-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1309970870-13336-1-git-send-email-shawn.guo@linaro.org> References: <1309970870-13336-1-git-send-email-shawn.guo@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com The patch copies platform data into pltfm_imx_data and reference the data there than platform data after probe. This work is inspired by Grant Likely and Troy Kisky. Signed-off-by: Shawn Guo Cc: Troy Kisky Cc: Grant Likely Cc: Wolfram Sang Cc: Chris Ball Acked-by: Grant Likely --- drivers/mmc/host/sdhci-esdhc-imx.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 3cc6f61..0b0e62e 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -45,6 +45,7 @@ struct pltfm_imx_data { int flags; u32 scratchpad; + struct esdhc_platform_data boarddata; }; static unsigned int esdhc_pltfm_get_max_blk_size(struct sdhci_host *host) @@ -69,8 +70,9 @@ static inline void esdhc_clrset_le(struct sdhci_host *host, u32 mask, u32 val, i static u32 esdhc_readl_le(struct sdhci_host *host, int reg) { - struct esdhc_platform_data *boarddata = - host->mmc->parent->platform_data; + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct pltfm_imx_data *imx_data = pltfm_host->priv; + struct esdhc_platform_data *boarddata = &imx_data->boarddata; /* fake CARD_PRESENT flag */ u32 val = readl(host->ioaddr + reg); @@ -92,8 +94,7 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg) { struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct pltfm_imx_data *imx_data = pltfm_host->priv; - struct esdhc_platform_data *boarddata = - host->mmc->parent->platform_data; + struct esdhc_platform_data *boarddata = &imx_data->boarddata; if (unlikely((reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE) && (boarddata->cd_type == ESDHC_CD_GPIO))) @@ -210,8 +211,9 @@ static unsigned int esdhc_pltfm_get_min_clock(struct sdhci_host *host) static unsigned int esdhc_pltfm_get_ro(struct sdhci_host *host) { - struct esdhc_platform_data *boarddata = - host->mmc->parent->platform_data; + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct pltfm_imx_data *imx_data = pltfm_host->priv; + struct esdhc_platform_data *boarddata = &imx_data->boarddata; switch (boarddata->wp_type) { case ESDHC_WP_GPIO: @@ -291,12 +293,14 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev) if (!(cpu_is_mx25() || cpu_is_mx35() || cpu_is_mx51())) imx_data->flags |= ESDHC_FLAG_MULTIBLK_NO_INT; - boarddata = host->mmc->parent->platform_data; - if (!boarddata) { + if (!host->mmc->parent->platform_data) { dev_err(mmc_dev(host->mmc), "no board data!\n"); err = -EINVAL; goto no_board_data; } + imx_data->boarddata = *((struct esdhc_platform_data *) + host->mmc->parent->platform_data); + boarddata = &imx_data->boarddata; /* write_protect */ if (boarddata->wp_type == ESDHC_WP_GPIO) { @@ -373,8 +377,8 @@ static int __devexit sdhci_esdhc_imx_remove(struct platform_device *pdev) { struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - struct esdhc_platform_data *boarddata = host->mmc->parent->platform_data; struct pltfm_imx_data *imx_data = pltfm_host->priv; + struct esdhc_platform_data *boarddata = &imx_data->boarddata; int dead = (readl(host->ioaddr + SDHCI_INT_STATUS) == 0xffffffff); sdhci_remove_host(host, dead);